0fa5fc47a2
Merge branch 'master' into DRTVWR-527-maint
2021-04-30 03:04:47 +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
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
7ab897baf0
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-16 23:05:40 +02:00
56eda0385e
SL-13395 Allow creating outfit folders under My Outfits
2021-04-16 20:37:02 +03:00
885215519d
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-12 11:56:45 +02:00
8215fff0c2
SL-14717 Ability to trigger left clicks (and more) on animesh objects
...
Contribution by Rohacan Hirons
SL-14717 Follow ups
SL-14717 Using the cached setting in LLToolPie::handleHover()
2021-04-06 23:24:38 +03:00
db72dc7d0f
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-02 19:33:18 +02:00
c0f28ae362
SL-14927 Some avatar names not resolving
2021-03-18 23:01:04 +02:00
b237c26fbf
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-03-10 20:28:57 +01:00
f185e03543
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-03-10 16:38:27 +01: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
25f0f49a91
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-03-03 21:22:29 +01: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
160d874a9c
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llviewerinventory.cpp
2021-02-03 22:09:42 +01: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
7bc0ad1ea5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-18 19:07:12 +01:00
339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01: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
ba47d93154
SL-14491 llDialog spacing inconsistent between string and buttons
2021-01-04 20:32:58 +02:00
84194e0461
SL-13560 Water reflections do not reflect everything when ALM is enabled
...
Contribution
2020-12-28 14:44:36 +01: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
602a82dc33
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 10:11:43 +01: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
d6480e2b7f
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
2020-11-11 22:54:23 +02:00
9b511e87f5
SL-13560 Water reflections do not reflect everything when ALM is enabled
...
Contribution
2020-10-26 22:29:54 +02:00
3c16b5d369
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 15:12:16 +02:00
32b5aa20c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-14 23:48:24 +02:00
42330f2008
Merge branch 'master' into DRTVWR-483
2020-10-14 22:01:05 +03: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
efbb274251
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 07:33:20 +02:00
41ac9cb015
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 06:52:54 +02:00
f4bfaeb45e
Merge branch 'master' into DRTVWR-483
2020-09-23 01:48:13 +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
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
7a22cc4fa5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 12:00:10 +02:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
9abbdb74f2
Merge branch 'master' into DRTVWR-483
2020-08-18 19:17:09 +03: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
9c022ddce1
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-24 13:49:06 +02:00
9114d7a524
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
2020-06-03 15:37:08 +03:00
e7c9024d75
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-03 12:28:08 +02:00
353afb48f2
SL-13239 Add 'Touch' to the various attachment context menus
2020-05-28 18:38:01 +03:00
7147dea550
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-24 18:42:19 +02:00
ae24afec8f
SL-13190 Allow Edit Attached Object Position From Inventory
2020-05-22 14:37:14 +03:00
a879e86b8e
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-19 21:53:26 +02:00
13086737cc
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-05-19 21:50:44 +02:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
3a3e917f38
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 14:43:31 +02:00
f7ab3b2f4b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 12:26:21 +02:00
05ad4de150
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
2020-05-19 10:20:31 +02:00
6c79fdd695
Merge branch 'master' into DRTVWR-507-maint
2020-05-19 10:49:11 +03:00
63004f50e3
Merge branch 'master' into DRTVWR-482
2020-05-19 10:47:00 +03:00
05800a402b
Merge branch 'master' into DRTVWR-483
2020-05-19 10:42:26 +03:00
510574dc14
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
2020-05-18 23:41:19 +03:00
0007ff2660
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-07 12:29:58 +02:00
e1504d8c56
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 21:09:42 +03:00
9c3368bbf6
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 19:08:55 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
67d8dda08c
Merge branch 'master' into DRTVWR-483
2020-05-04 23:39:23 +03:00
89e17d1780
Merge branch 'master' into DRTVWR-482
2020-05-04 23:39:10 +03:00
6364e2fff6
Merge branch 'master' into DRTVWR-460
2020-05-04 23:35:54 +03:00
66523963fd
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-04 21:00:08 +02:00
1d7810b916
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-04 10:28:09 +02:00
9c31597e5e
SL-13141 Crashfix contribution
2020-04-30 17:51:46 +03:00
a0d7d87355
Merge branch 'master' into DRTVWR-460
...
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
2020-04-26 21:57:40 +03:00
75cdb94de3
Merge branch 'master' of D:/Dev/phoenix-firestorm-camus
2020-04-23 19:14:47 +02:00
40b39f9990
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-23 18:13:29 +02:00
ddc7fc297b
Merge branch 'master' of D:/Dev/phoenix-firestorm-legacy-profiles
2020-04-23 18:08:09 +02:00
dbf00cf036
Merge branch 'master'
2020-04-23 17:40:31 +02:00
4cf4243573
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21 15:37:25 +03:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
44fe667661
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-04-11 22:48:18 +02:00
85fb2b81d8
SL-11360 Viewer floods the server with GroupProfileRequest
2020-02-14 18:37:25 +00:00
b9f0eb54ce
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-02-12 12:45:56 +02:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
4d09c68e4c
Merge Firestorm LGPL
2019-12-13 15:35:54 +01:00
8f3213d7d4
Merge Firestorm LGPL
2019-12-13 00:14:24 +01:00
d0c7b4fade
Merged in lindenlab/viewer-release
2019-11-27 08:19:22 +02:00
b371c5a35d
Merged in lindenlab/viewer-release
2019-10-31 21:13:12 +02:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
5082b42d0a
Merged in lindenlab/viewer-release
2019-10-23 18:30:09 +03:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
e35c22b8ee
Merge Firestorm LGPL
2019-10-18 18:29:27 +02:00
9b173f0b6e
Merge Firestorm LGPL
2019-10-17 22:55:13 +02:00
0cb17cd365
Merge Firestorm LGPL
2019-10-16 23:31:52 +02:00
c7747d2a1b
merge
2019-10-16 22:24:03 +01:00
014451229e
Merge Firestorm LGPL
2019-09-11 20:22:35 +02:00
9f005065d0
Merge Firestorm LGPL
2019-09-10 23:40:54 +02:00
8e82f50a76
Merged in lindenlab/viewer-release
2019-09-10 23:31:38 +03:00
4921618390
Merged in lindenlab/viewer-release
2019-09-10 23:30:52 +03:00
df79950138
Merge Firestorm LGPL
2019-09-10 21:55:47 +02:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
a97f13e161
Merge viewer-release 6.3.2
2019-09-10 10:19:50 -07:00
facd9ee175
Merge viewer-legacy-profiles
2019-08-19 22:18:50 +02:00
4087c4c077
Merge Firestorm LGPL
2019-08-13 20:17:51 +02:00
8a3ae3a97d
SL-10675 Updated contributions.txt
2019-07-22 20:36:22 +03:00
69f14e2f29
Initial merge of viewer-legacy-profiles
...
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
2019-07-19 11:21:54 +02:00
3d1a765c61
Merge Firestorm LGPL
2019-07-12 19:21:10 +02:00
f03b696c3d
Merge viewe-release 6.2
2019-07-12 08:34:25 -07:00
ff536ef9c2
Merged in lindenlab/viewer-release
2019-06-29 06:37:27 +03:00
139c66b684
Merged in lindenlab/viewer-release
2019-06-28 02:19:25 +03:00
25d83975f4
Merge Firestorm LGPL
2019-06-22 20:54:01 +02:00
ad64edd9c0
Merged in lindenlab/viewer-lynx
2019-06-22 03:17:43 +03:00
13580377c4
Merged in lindenlab/viewer-release
2019-06-22 03:16:39 +03:00
768c3570ab
Merge Firestorm LGPL
2019-06-20 23:21:49 +02:00
e0ca19d8ab
Merge LL viewer-release 6.2.3
2019-06-20 23:14:11 +02:00
9313bc50c4
Merge the Rainbow
2019-06-20 13:42:00 -07:00
89a6a001fc
Merge viewer-neko
2019-06-17 21:48:11 +02:00
0574d03bfa
OPEN-345 Fixed enigmatic messages during build
2019-06-17 19:46:20 +03:00
b996c95f32
SL-11079 Updated contributions.txt
2019-05-28 23:52:23 +03:00
e6970af7a1
Merge Firestorm LGPL
2019-05-09 19:52:27 +02:00
428c15acfb
Merge Firestorm LGPL
2019-05-08 20:54:26 +02:00
3175525950
Merged in lindenlab/viewer-release
2019-05-08 21:41:56 +03:00
93f0023efa
Merged in lindenlab/viewer-release
2019-05-08 21:41:11 +03:00
65cb4b6d20
Merge 6.2.2
2019-05-08 10:37:34 -07:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
6d377d07fa
Merge viewer-neko
2019-05-04 01:02:28 +02:00
be0c609eaf
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
2019-05-02 13:11:18 +03:00
3961a9e80a
SL-11061 Viewer crashes on launch if serial is either unset or does not return a string
2019-04-30 15:24:49 +03:00
c35758512e
Merge Firestorm LGPL
2019-04-18 13:11:23 +02:00
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
6ac2278308
Merge Firestorm LGPL
2019-04-17 19:46:33 +02:00
f14888b616
Merge 6.2.1
2019-04-17 08:43:14 -07:00
856cc1082b
Merge LL viewer-release 6.2.0
2019-04-17 17:12:42 +02:00
b5f8421839
Merged in lindenlab/viewer-release
2019-04-17 16:47:32 +03:00
922793e489
Merged in lindenlab/viewer-release
2019-04-17 16:47:13 +03:00
1d2ead44f6
Merge viewer-bear
2019-04-17 09:29:04 +02:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
579b76dcf3
Merge viewer-neko
2019-04-15 12:40:44 +02:00
724e3cca96
SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%
2019-04-11 00:19:58 +03:00
d7d8a15092
Fullbright + elimination of all references to calcFragAtmospherics.
...
--HG--
branch : OPEN-340
2019-04-10 02:49:25 -07:00
dcd8117b85
First stab at moving atmospheric var calcs to its own utility shader.
...
Still some work to go here. Largely related to how certain values (i.e., SSAO mix values) are supplied. But so far, so good.
--HG--
branch : OPEN-340
2019-04-09 22:35:40 -07:00
457df9cd67
SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%
2019-04-06 10:12:27 +03:00
d5971e939c
Merge Firestorm LGPL
2019-04-04 19:24:56 +02:00
2013578ca9
Update contributions.
...
--HG--
branch : BUG-226620
2019-04-03 16:07:39 -07:00
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
f89490c1de
Add attributions.
2019-04-02 17:03:35 -07:00
b8115d43c9
Merge 6.1.2
2019-04-02 14:32:59 -07:00
84d721c678
Merge Firestorm LGPL
2019-04-02 23:01:30 +02:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
62bec6aa36
Merged in lindenlab/viewer-release
2019-04-02 22:21:35 +03:00
c6e310c7c2
Merged in lindenlab/viewer-release
2019-04-02 22:20:59 +03:00
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
47e3c3aa21
BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad
2019-03-29 15:57:22 -07:00
766ae4d122
SL-10675 Updated contributions.txt
2019-03-05 00:10:13 +02:00
b0e32c3986
Merge viewer-cougar
2019-03-02 01:49:39 +01:00
599e081815
Backed out changeset: d5795c04fecc
2019-02-23 20:08:03 +02:00
f78ff79508
Update contributions list
2019-02-18 21:55:48 +02:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
dd2636a2c2
Merge viewer-neko
2019-01-10 21:10:36 +01:00
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02:00
f9ec853f4a
Merge viewer-neko
2019-01-03 19:07:09 +01:00
efa5f24d1b
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
da60cc476a
Merge viewer-release 6.0.2
2018-12-18 09:51:26 -08:00
428ca0689d
Merge Firestorm LGPL
2018-12-15 15:40:16 +01:00
74a56f30aa
Merged in lindenlab/viewer-release
2018-12-14 00:46:11 +02:00
0e36db79e1
Merge viewer-neko
2018-12-01 16:34:33 +01:00
Andrey Lihatskiy