8e2adbcde7
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-06-15 12:04:03 +02: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
e48376d29b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 17:33:00 +02:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
42da77402b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-01 00:43:21 +02:00
99b99a1b4a
Clean up a merge conflict
2021-04-29 13:45:15 -07:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
41ce0bec35
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-04-26 10:55:37 +02:00
b58c15b1bd
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression
2021-04-16 15:34:41 -07:00
b237c26fbf
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-03-10 20:28:57 +01: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
e150a40ff8
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-02-02 15:16:17 +01:00
7ca874a6e3
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-02 00:16:25 +01: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
3b3dc83edc
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-26 09:34:58 +01: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
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
5af5498cf6
SL-11300 Camera distance to avatar in neighbouring region incorrect
2021-01-06 22:52:18 +02:00
84194e0461
SL-13560 Water reflections do not reflect everything when ALM is enabled
...
Contribution
2020-12-28 14:44:36 +01:00
32b5aa20c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-14 23:48:24 +02:00
35708568d6
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
2020-10-14 21:58:43 +03:00
5b89548761
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-23 12:14:36 +02:00
b5635da9e9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 10:08:11 +02:00
41ac9cb015
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 06:52:54 +02: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
34444a0873
SL-13697 Items I am wearing continue to go to lost and found
...
Contribution from Ansariel Hiller
2020-09-21 23:47:08 +03:00
c49565be6e
SL-13858 FIXED Group chat transcripts named with double (group) (group).txt after opening chat history.
2020-08-25 21:19:41 +03:00
fc80d63a11
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 13:03:43 +02:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
b0274e1bdd
Merge branch 'master' into DRTVWR-482
2020-08-18 19:17:01 +03:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
c5af669e3b
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-08-12 12:24:35 +02:00
d240d381a2
SL-13583 Some behavior tweaks #1
2020-08-12 00:59:45 +03:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
3f1f5e884b
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-29 13:35:01 +02:00
67255f5d64
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-07-29 13:23:00 +02:00
350cf703a1
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 00:44:20 +02:00
b17e2aaff1
SL-13642 Updated contributions.txt
2020-07-22 06:48:15 +03:00
3c564f5afc
SL-11625 Fix for skewed baked texture offset values
2020-07-02 21:20:13 +03:00
Ansariel