0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
bc61c20560
SL-14702: Spruce up README
2021-08-02 10:10:14 -07:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
293272c2c7
Merge branch 'master' into DRTVWR-521-maint
2021-06-25 00:52:03 +03:00
a4c6c7059f
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
2021-06-25 00:51:02 +03:00
57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
6baaef4ee2
Add in the JIRA (SL-15398) describing the contribution from FS:Ansariel to the contributions.txt file
2021-06-14 11:10:22 -07:00
e7cbd00d64
Fix for SL-15382 Update contributions text file in Viewer
2021-06-10 16:51:23 -07:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
a4595bdaf2
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# doc/contributions.txt
2021-06-07 21:04:32 +03:00
e7319fb671
Merge branch 'master' into DRTVWR-518-ui
2021-06-07 21:03:27 +03:00
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
99b99a1b4a
Clean up a merge conflict
2021-04-29 13:45:15 -07:00
3f31901640
Merge master (DRTVWR-515) into DRTVWR-516-maint
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
c54382b760
Merge branch 'master' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
2021-04-29 20:04:33 +03:00
b58c15b1bd
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression
2021-04-16 15:34:41 -07:00
56eda0385e
SL-13395 Allow creating outfit folders under My Outfits
2021-04-16 20:37:02 +03:00
c0f28ae362
SL-14927 Some avatar names not resolving
2021-03-18 23:01:04 +02:00
43fbd41bfd
Revert "SL-14939 Fixed the log spam"
...
This reverts commit b1ab29eeb6
2021-03-09 21:57:41 +02:00
3067f56b1f
Revert "SL-14940 Fixed ignoring custom cache path"
...
This reverts commit 8874647858
2021-03-09 21:57:32 +02:00
ada8ad1bc2
SL-14940 Fixed ignoring custom cache path
2021-03-04 12:49:48 +02:00
87908bab6d
SL-14939 Fixed the log spam
2021-03-04 12:23:57 +02:00
925feaaf95
SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer.
2021-03-04 12:06:12 +02:00
8874647858
SL-14940 Fixed ignoring custom cache path
...
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/dace23b988af90a65ef57b0b9f540fc48d439dc3 )
2021-03-03 19:33:02 +02:00
b1ab29eeb6
SL-14939 Fixed the log spam
...
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/5f927b52fdfeebb5db595c7c60c711cee383820b )
2021-03-03 19:27:22 +02:00
baa8147314
Merged in SL-14706 (pull request #457 )
...
SL-14706 Merge Sovereign Engineer's fix for stars not centered around camera: Stars render around center of sim instead of center of camera.
Approved-by: Dave Houlton
2021-02-01 22:29:43 +00:00
ab02a6dfd4
SL-14706 Merge Sovereign Engineer's fix for stars not centered around camera: Stars render around center of sim instead of center of camera.
2021-01-29 18:41:04 -08:00
cc6d132e90
SL-14732: Merge Sovereign Engineer's cloud patch: Fix writing outside outside of the bound fbo in forward render class2 cloud shader
2021-01-29 14:32:37 -08:00
d7b2016e39
SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma space for accurate color reproduction of sun textures
2021-01-29 13:06:55 -08:00
a3d31ca683
SL-14766 long unicode display names corrupt the conversation.log
...
Contribution by Beq Janus
2021-01-26 20:28:31 +02:00
760c6a996a
SL-14705: Fix merge conflict
2021-01-25 15:53:43 -08:00
1e26adf288
SL-14707: Merge Sovereign Engineer's fix for clouds: Clouds are unusually dim in EEP
2021-01-22 16:31:50 -08:00
a059e0d2e5
SL-3136 Logout crash fixes from Ansariel Hiller
2021-01-22 23:01:58 +02:00
5af5498cf6
SL-11300 Camera distance to avatar in neighbouring region incorrect
2021-01-06 22:52:18 +02:00
ba47d93154
SL-14491 llDialog spacing inconsistent between string and buttons
2021-01-04 20:32:58 +02:00
e3c2859e55
SL-11300 Camera distance to avatar in neighbouring region incorrect
2020-12-14 19:20:22 +02:00
83a9d09b41
SL-14518 Trivial changes to settings.xml
...
Contribution, move comments to their own lines to simplify parsing
2020-12-11 19:08:06 +02:00
92af5af736
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
9b511e87f5
SL-13560 Water reflections do not reflect everything when ALM is enabled
...
Contribution
2020-10-26 22:29:54 +02:00
35708568d6
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
2020-10-14 21:58:43 +03:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
730af5d488
Merged master (DRTVWR-503) into DRTVWR-482
2020-09-22 22:51:33 +03:00
Andrey Lihatskiy