d4d5d4018d
Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q
2022-10-29 00:32:59 +03:00
0aabcf9a85
Merge branch 'master' into DRTVWR-539
2022-10-27 14:23:42 +03:00
b8f75bd161
Merge branch 'master' into DRTVWR-570-maint-Q
2022-10-26 23:58:06 +03:00
aad3b32a92
Merge branch 'master' into DRTVWR-568
2022-10-26 12:07:12 -07:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
439aa79414
SL-18432 Fix for alpha sorting
2022-10-24 22:14:20 +03:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
f0cd5407c4
SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into DRTVWR-570-maint-Q
2022-10-19 23:53:53 +03:00
dbbc710739
SL-18348 FIXED Include next/previous face doesn't work
2022-10-13 14:39:29 +03:00
338aeef7e9
SL-14696 SL-13629 Re-add gradation fix after merging a contribution
2022-10-01 00:48:25 +03:00
6614a6ee99
SL-18249 Optimizations to mesh and material loading
2022-09-28 18:42:10 +03:00
198420f9f6
SL-18248 Move frame breakdown stats to 'Scene loading statistics' floater
2022-09-28 14:16:16 +03:00
9bad5d08fb
SL-17238 Large cmake contribution by NickyD
2022-09-17 19:30:31 +03:00
a9a63db0f0
Merge branch 'master' into DRTVWR-548-maint-N
2022-08-31 00:17:37 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
1b369c7f10
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
1167ea994c
SL-17634 Replace deprecated carbon Gestalt calls
2022-06-22 18:00:49 +03:00
791b7ff0e9
SL-17585 Don't bother users with dialogs if we are already quiting
2022-06-20 17:07:49 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
4e282db26b
SL-17218: Credit NickyD's contributions to this Jira.
2022-04-14 15:32:19 -04:00
51e318fd8d
SL-14541 Pull in updated zlib-ng
...
Nicky Dasmijn's contribution for zlib-ng Linux builds
2022-03-05 11:34:13 +02:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
e70fe3a50d
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2022-02-28 22:01:18 +02:00
0bef5e553e
Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"
...
This reverts commit 8215fff0c2
2022-01-21 19:13:28 +02:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
b33e18585d
Merge branch 'master' into DRTVWR-483
2021-12-26 14:00:00 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
442abdaac7
SL-16438 Machine id for Linux is always 0
2021-12-03 00:49:33 +02:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
981cdca0a5
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:34:29 +02:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
ad91d0fd92
SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated
2021-10-27 10:05:13 -07:00
a68ca665ad
SL-15958 Stop impostored avatars from casting shadows
2021-09-22 17:51:00 +03:00
bbd5a9c62b
SL-16021 FIXED impostors are creating full detailed shadows
2021-09-17 15:29:00 +03:00
df5127136f
SL-15709: Add Tracy support to viewer
2021-09-03 17:53:43 -07: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
638fe87576
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
2021-07-23 07:10:26 +03: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
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
9873e7bba9
Merge branch 'master' into DRTVWR-527-maint
2021-07-19 22:22:32 +03: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
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
0ca16a1f95
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
2021-06-25 01:02:04 +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
7587f0dd88
Merge branch 'master' into DRTVWR-483
2021-06-07 21:08:43 +03:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
1639e1ceb4
Merge branch 'master' into DRTVWR-527-maint
2021-06-07 21:04:54 +03: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
ed78b2b938
SL-15234 Fix for linux build of 3p-uriparser by NickyD
...
Linux specific contibution. Should not affect win and darwin. Doesn't include linux build, just an update to ensure changes gets pulled into uriparser's master when viewer gets promoted and to make sure nothing complains about issues with 'head revision'.
2021-05-07 20:57:43 +03:00
f655bb1f27
Merge branch master (DRTVWR-515) into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-05-06 22:13:40 +03:00
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
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
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
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
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
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
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
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
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
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
9114d7a524
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
2020-06-03 15:37:08 +03:00
353afb48f2
SL-13239 Add 'Touch' to the various attachment context menus
2020-05-28 18:38:01 +03:00
ae24afec8f
SL-13190 Allow Edit Attached Object Position From Inventory
2020-05-22 14:37:14 +03:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03: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
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
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
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
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
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
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
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
c7747d2a1b
merge
2019-10-16 22:24:03 +01: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
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
8a3ae3a97d
SL-10675 Updated contributions.txt
2019-07-22 20:36:22 +03: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
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
9313bc50c4
Merge the Rainbow
2019-06-20 13:42:00 -07:00
Andrey Lihatskiy