Andrey Lihatskiy
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
Andrey Lihatskiy
293272c2c7
Merge branch 'master' into DRTVWR-521-maint
2021-06-25 00:52:03 +03:00
Andrey Lihatskiy
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
Callum Prentice
57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
Callum Prentice
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
Callum Prentice
e7cbd00d64
Fix for SL-15382 Update contributions text file in Viewer
2021-06-10 16:51:23 -07:00
Callum Prentice
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
Andrey Lihatskiy
7587f0dd88
Merge branch 'master' into DRTVWR-483
2021-06-07 21:08:43 +03:00
Andrey Lihatskiy
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
Andrey Lihatskiy
1639e1ceb4
Merge branch 'master' into DRTVWR-527-maint
2021-06-07 21:04:54 +03:00
Andrey Lihatskiy
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
Andrey Lihatskiy
a4595bdaf2
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# doc/contributions.txt
2021-06-07 21:04:32 +03:00
Andrey Lihatskiy
e7319fb671
Merge branch 'master' into DRTVWR-518-ui
2021-06-07 21:03:27 +03:00
Andrey Lihatskiy
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
Andrey Kleshchev
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
Andrey Kleshchev
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
Andrey Lihatskiy
0fa5fc47a2
Merge branch 'master' into DRTVWR-527-maint
2021-04-30 03:04:47 +03:00
Andrey Lihatskiy
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
Andrey Lihatskiy
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
Callum Prentice
99b99a1b4a
Clean up a merge conflict
2021-04-29 13:45:15 -07:00
Andrey Kleshchev
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
Dave Houlton
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
Andrey Lihatskiy
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
Ptolemy
b58c15b1bd
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression
2021-04-16 15:34:41 -07:00
Andrey Kleshchev
56eda0385e
SL-13395 Allow creating outfit folders under My Outfits
2021-04-16 20:37:02 +03:00
Andrey Lihatskiy
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
Andrey Kleshchev
c0f28ae362
SL-14927 Some avatar names not resolving
2021-03-18 23:01:04 +02:00
Andrey Lihatskiy
43fbd41bfd
Revert "SL-14939 Fixed the log spam"
...
This reverts commit b1ab29eeb6 .
2021-03-09 21:57:41 +02:00
Andrey Lihatskiy
3067f56b1f
Revert "SL-14940 Fixed ignoring custom cache path"
...
This reverts commit 8874647858 .
2021-03-09 21:57:32 +02:00
Mnikolenko Productengine
ada8ad1bc2
SL-14940 Fixed ignoring custom cache path
2021-03-04 12:49:48 +02:00
Mnikolenko Productengine
87908bab6d
SL-14939 Fixed the log spam
2021-03-04 12:23:57 +02:00
Mnikolenko Productengine
925feaaf95
SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer.
2021-03-04 12:06:12 +02:00
Andrey Lihatskiy
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
Andrey Lihatskiy
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
Michael Pohoreski
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
Ptolemy
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
Ptolemy
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
Ptolemy
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
Andrey Kleshchev
a3d31ca683
SL-14766 long unicode display names corrupt the conversation.log
...
Contribution by Beq Janus
2021-01-26 20:28:31 +02:00
Ptolemy
760c6a996a
SL-14705: Fix merge conflict
2021-01-25 15:53:43 -08:00
Ptolemy
1e26adf288
SL-14707: Merge Sovereign Engineer's fix for clouds: Clouds are unusually dim in EEP
2021-01-22 16:31:50 -08:00
Andrey Kleshchev
a059e0d2e5
SL-3136 Logout crash fixes from Ansariel Hiller
2021-01-22 23:01:58 +02:00
Andrey Kleshchev
5af5498cf6
SL-11300 Camera distance to avatar in neighbouring region incorrect
2021-01-06 22:52:18 +02:00
Andrey Kleshchev
ba47d93154
SL-14491 llDialog spacing inconsistent between string and buttons
2021-01-04 20:32:58 +02:00
Andrey Kleshchev
e3c2859e55
SL-11300 Camera distance to avatar in neighbouring region incorrect
2020-12-14 19:20:22 +02:00
Andrey Kleshchev
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
Andrey Kleshchev
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
Andrey Lihatskiy
d6480e2b7f
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
2020-11-11 22:54:23 +02:00
Andrey Kleshchev
9b511e87f5
SL-13560 Water reflections do not reflect everything when ALM is enabled
...
Contribution
2020-10-26 22:29:54 +02:00
Andrey Lihatskiy
42330f2008
Merge branch 'master' into DRTVWR-483
2020-10-14 22:01:05 +03:00
Andrey Lihatskiy
35708568d6
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
2020-10-14 21:58:43 +03:00
Andrey Lihatskiy
f4bfaeb45e
Merge branch 'master' into DRTVWR-483
2020-09-23 01:48:13 +03:00
Andrey Lihatskiy
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
Andrey Kleshchev
730af5d488
Merged master (DRTVWR-503) into DRTVWR-482
2020-09-22 22:51:33 +03:00
Andrey Kleshchev
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
Mnikolenko Productengine
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
Andrey Lihatskiy
9abbdb74f2
Merge branch 'master' into DRTVWR-483
2020-08-18 19:17:09 +03:00
Andrey Lihatskiy
b0274e1bdd
Merge branch 'master' into DRTVWR-482
2020-08-18 19:17:01 +03:00
Andrey Lihatskiy
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
Andrey Kleshchev
d240d381a2
SL-13583 Some behavior tweaks #1
2020-08-12 00:59:45 +03:00
Andrey Lihatskiy
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
Andrey Lihatskiy
b17e2aaff1
SL-13642 Updated contributions.txt
2020-07-22 06:48:15 +03:00
Andrey Lihatskiy
3c564f5afc
SL-11625 Fix for skewed baked texture offset values
2020-07-02 21:20:13 +03:00
Mnikolenko Productengine
9114d7a524
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
2020-06-03 15:37:08 +03:00
Mnikolenko Productengine
353afb48f2
SL-13239 Add 'Touch' to the various attachment context menus
2020-05-28 18:38:01 +03:00
Mnikolenko Productengine
ae24afec8f
SL-13190 Allow Edit Attached Object Position From Inventory
2020-05-22 14:37:14 +03:00
Andrey Lihatskiy
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
Andrey Lihatskiy
6c79fdd695
Merge branch 'master' into DRTVWR-507-maint
2020-05-19 10:49:11 +03:00
Andrey Lihatskiy
63004f50e3
Merge branch 'master' into DRTVWR-482
2020-05-19 10:47:00 +03:00
Andrey Lihatskiy
05800a402b
Merge branch 'master' into DRTVWR-483
2020-05-19 10:42:26 +03:00
Andrey Lihatskiy
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
Mnikolenko Productengine
e1504d8c56
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 21:09:42 +03:00
Mnikolenko Productengine
9c3368bbf6
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 19:08:55 +03:00
Andrey Lihatskiy
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
Andrey Lihatskiy
67d8dda08c
Merge branch 'master' into DRTVWR-483
2020-05-04 23:39:23 +03:00
Andrey Lihatskiy
89e17d1780
Merge branch 'master' into DRTVWR-482
2020-05-04 23:39:10 +03:00
Andrey Lihatskiy
6364e2fff6
Merge branch 'master' into DRTVWR-460
2020-05-04 23:35:54 +03:00
Andrey Kleshchev
9c31597e5e
SL-13141 Crashfix contribution
2020-04-30 17:51:46 +03:00
Andrey Lihatskiy
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
Andrey Lihatskiy
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
Andrey Lihatskiy
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
Andrey Lihatskiy
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
Andrey Kleshchev
85fb2b81d8
SL-11360 Viewer floods the server with GroupProfileRequest
2020-02-14 18:37:25 +00:00
maxim_productengine
b9f0eb54ce
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-02-12 12:45:56 +02:00
AndreyL ProductEngine
d0c7b4fade
Merged in lindenlab/viewer-release
2019-11-27 08:19:22 +02:00
AndreyL ProductEngine
b371c5a35d
Merged in lindenlab/viewer-release
2019-10-31 21:13:12 +02:00
AndreyL ProductEngine
5082b42d0a
Merged in lindenlab/viewer-release
2019-10-23 18:30:09 +03:00
andreykproductengine
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
Brad Payne (Vir Linden)
c7747d2a1b
merge
2019-10-16 22:24:03 +01:00
AndreyL ProductEngine
8e82f50a76
Merged in lindenlab/viewer-release
2019-09-10 23:31:38 +03:00
AndreyL ProductEngine
4921618390
Merged in lindenlab/viewer-release
2019-09-10 23:30:52 +03:00
Graham Linden
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
Graham Linden
a97f13e161
Merge viewer-release 6.3.2
2019-09-10 10:19:50 -07:00
AndreyL ProductEngine
8a3ae3a97d
SL-10675 Updated contributions.txt
2019-07-22 20:36:22 +03:00
Graham Linden
f03b696c3d
Merge viewe-release 6.2
2019-07-12 08:34:25 -07:00
AndreyL ProductEngine
ff536ef9c2
Merged in lindenlab/viewer-release
2019-06-29 06:37:27 +03:00
AndreyL ProductEngine
139c66b684
Merged in lindenlab/viewer-release
2019-06-28 02:19:25 +03:00
AndreyL ProductEngine
ad64edd9c0
Merged in lindenlab/viewer-lynx
2019-06-22 03:17:43 +03:00
AndreyL ProductEngine
13580377c4
Merged in lindenlab/viewer-release
2019-06-22 03:16:39 +03:00
Graham Linden
9313bc50c4
Merge the Rainbow
2019-06-20 13:42:00 -07:00
AndreyL ProductEngine
0574d03bfa
OPEN-345 Fixed enigmatic messages during build
2019-06-17 19:46:20 +03:00
AndreyL ProductEngine
b996c95f32
SL-11079 Updated contributions.txt
2019-05-28 23:52:23 +03:00
AndreyL ProductEngine
3175525950
Merged in lindenlab/viewer-release
2019-05-08 21:41:56 +03:00
AndreyL ProductEngine
93f0023efa
Merged in lindenlab/viewer-release
2019-05-08 21:41:11 +03:00
Graham Linden
65cb4b6d20
Merge 6.2.2
2019-05-08 10:37:34 -07:00
Graham Linden
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
maxim_productengine
be0c609eaf
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
2019-05-02 13:11:18 +03:00
Graham Linden
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
Graham Linden
f14888b616
Merge 6.2.1
2019-04-17 08:43:14 -07:00
AndreyL ProductEngine
b5f8421839
Merged in lindenlab/viewer-release
2019-04-17 16:47:32 +03:00
AndreyL ProductEngine
922793e489
Merged in lindenlab/viewer-release
2019-04-17 16:47:13 +03:00
AndreyL ProductEngine
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
Geenz
d7d8a15092
Fullbright + elimination of all references to calcFragAtmospherics.
...
--HG--
branch : OPEN-340
2019-04-10 02:49:25 -07:00
Geenz
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
AndreyL ProductEngine
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
Geenz
2013578ca9
Update contributions.
...
--HG--
branch : BUG-226620
2019-04-03 16:07:39 -07:00
Graham Linden
f89490c1de
Add attributions.
2019-04-02 17:03:35 -07:00
Graham Linden
b8115d43c9
Merge 6.1.2
2019-04-02 14:32:59 -07:00
Graham Linden
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
AndreyL ProductEngine
62bec6aa36
Merged in lindenlab/viewer-release
2019-04-02 22:21:35 +03:00
AndreyL ProductEngine
c6e310c7c2
Merged in lindenlab/viewer-release
2019-04-02 22:20:59 +03:00
AndreyL ProductEngine
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
Rider Linden
47e3c3aa21
BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad
2019-03-29 15:57:22 -07:00
AndreyL ProductEngine
766ae4d122
SL-10675 Updated contributions.txt
2019-03-05 00:10:13 +02:00
AndreyL ProductEngine
599e081815
Backed out changeset: d5795c04fecc
2019-02-23 20:08:03 +02:00
ruslantproductengine
f78ff79508
Update contributions list
2019-02-18 21:55:48 +02:00
andreykproductengine
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
AndreyL ProductEngine
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02:00
AndreyL ProductEngine
efa5f24d1b
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
Graham Linden
da60cc476a
Merge viewer-release 6.0.2
2018-12-18 09:51:26 -08:00
AndreyL ProductEngine
74a56f30aa
Merged in lindenlab/viewer-release
2018-12-14 00:46:11 +02:00
AndreyL ProductEngine
3b932c27b7
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
andreykproductengine
baeca41027
SL-10089 Logs to see which gSavedSettings.get calls should be cached
2018-11-19 20:20:34 +02:00
AndreyL ProductEngine
d757234397
SL-9800 Changed llTextBox to have selectable "message" text
2018-10-10 00:04:13 +03:00
Nat Goodspeed
697d2cdff4
STORM-2116: Add to Cinder Biscuits contributions.
2018-09-12 20:21:13 -04:00
andreykproductengine
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
Graham Linden
bd7ad9c157
Merge viewer-release
2018-08-02 23:02:42 +01:00
AndreyL ProductEngine
3983f5b1e2
Merged in lindenlab/viewer-release
2018-08-02 23:18:28 +03:00
AndreyL ProductEngine
21f19cb6f0
Merged in lindenlab/viewer-release
2018-06-22 11:08:36 +03:00
Graham Linden
2db71067f2
Merge 5.1.7
2018-06-21 17:39:13 +01:00
AndreyL ProductEngine
253a767fa3
Backed out changeset: 4ce8c663a9a0
...
STORM-2122: UDP data bandwidth measuring is off by factor 8
2018-06-19 21:20:48 +03:00
ruslantproductengine
b0e5bee0b4
MAINT-8723 - Selecting mesh objects make several HUD-related items invisible
...
FIXED (from FS Ansariel patches)
2018-06-07 18:46:03 +03:00
Graham Linden
3ed3cfce56
Merge 5.1.6
2018-05-31 20:12:26 +01:00
Graham Linden
eb8eaa58a4
Merge storm-2145 dev into lindenlab branch parented from viewer-release
2018-05-31 17:10:48 +01:00
andreykproductengine
9437d1511e
merge from viewer-release
2018-06-01 01:18:47 +03:00
AndreyL ProductEngine
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
AndreyL ProductEngine
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
Jonathan Yap
bff875d25f
STORM-2145 Camera controls opacity is now working
2018-02-02 10:39:59 -05:00
Oz Linden
a7911c4379
merge changes for 5.1.0-release
2018-01-19 11:18:29 -05:00
Ansariel
2269a9f074
MAINT-8085 done right
2018-01-17 13:31:26 +01:00
AndreyL ProductEngine
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
Jonathan Yap
1e586749ef
STORM-2145 Merge up to viewer-release
2018-01-12 09:08:49 -05:00
Nat Goodspeed
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
Ansariel
f1c76a376c
STORM-2151: Respect "Hide cursor while typing" user setting on Windows
2017-10-16 10:41:45 +02:00
Kitty Barnett
18fa2e6471
MAINT-7081 [FIXED] Access (write) violation / buffer overrun in LLTextureFetchWorker::doWork()
...
The trouble lines are:
U8 * buffer = (U8 *) ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_size);
if (cur_size > 0)
{
memcpy(buffer, mFormattedImage->getData(), cur_size);
}
If 'cur_size > mHttpReplyOffset + append_size' then 'total_size -= src_offset' will cause
total_size to be smaller than cur_size causing a write access violation on the memcpy.
Since the response is invalid it seemed best to make it follow the other failed partial condition.
(transplanted from 737e28ec6b4d74f3ff915a4effc13d7b615a6a9b)
2017-10-12 22:55:15 +02:00
Mnikolenko Productengine
788d745071
MAINT-7899 FIXED Apparent broken material texture selection
2017-10-13 12:23:08 +03:00
Nat Goodspeed
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
Oz Linden
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
Mnikolenko Productengine
5d812b95e8
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
Oz Linden
b0d8f3a1ab
MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs in Windows 8 compatibility mode)
2017-07-10 16:30:28 -04:00
AndreyL ProductEngine
270cd8ff15
Merged in lindenlab/viewer-release
2017-06-20 23:16:03 +03:00
AndreyL ProductEngine
f7186ac260
Contributors list fix: NickyD and Nicky Dasmijn are the same person
2017-07-11 20:46:53 +03:00
pavelkproductengine
530f69ff33
MAINT-7541 Not able to save login credentials on clean install
2017-07-10 17:22:12 +03:00
Mnikolenko Productengine
5478f2a223
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
pavelkproductengine
5205be0c65
STORM-2148 Crash on trying to save texture file(s) to computer from inventory
2017-05-31 19:28:46 +03:00
Kitty Barnett
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +02:00
Brad Payne (Vir Linden)
806fd24704
merge
2017-05-22 21:09:07 +01:00
Brad Payne (Vir Linden)
ed9653f711
MAINT-7343 - contributions.txt update
2017-05-01 15:17:28 -04:00
AndreyL ProductEngine
d4d56f004a
MAINT-7074 Fixed ability to escape from skin directory with <icon>
2017-04-19 21:19:04 +03:00
Ansariel
b59ac959fc
MAINT-6519 Contribution, adds feature to replace inventory links
2017-04-27 19:19:11 +02:00
Jonathan Yap
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
Mnikolenko Productengine
5d7c5ea4d2
MAINT-7059 [contribution] Import of custom spellcheck dictionary fails silently
2017-01-18 12:20:55 +02:00
andreykproductengine
6b59d55230
MAINT-7028 Fixes scrambling of Outfit Order in Appearance Panel
2017-01-06 01:25:15 +02:00
AndreyL ProductEngine
946b28ad76
Merged STORM-2142
2016-12-19 19:18:53 +02:00
Cinder
a6cda1ee06
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
2016-12-15 09:34:04 -06:00
AndreyL ProductEngine
7dcea20c4d
Backed out changeset: b1a30962dd54
2016-12-15 02:41:39 +02:00
AndreyL ProductEngine
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Drake Arconis
fb9cb88272
STORM-2143 Correct vertex winding of stars
2016-11-19 22:25:39 -05:00
Ansariel Hiller
76b3efe01c
MAINT-6953 [Contribution] Error in DPI scaling calculation
2016-11-19 11:19:01 +00:00
AndreyL ProductEngine
fb0355fdba
Merged in Ansariel/storm-2141
2016-11-21 21:18:13 +02:00
Jonathan Yap
ec5051699a
STORM-2142 Tweaks to some of the 4 combined issues
2016-11-16 11:21:54 -05:00
AndreyL ProductEngine
84222286cc
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2017-11-09 23:05:35 +02:00
Brad Payne (Vir Linden)
d31596db6a
merge
2016-11-16 08:39:41 -05:00
Ansariel
420b1c9429
STORM-2141: Fix various inventory floater related issues:
...
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
Brad Payne (Vir Linden)
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
AndreyL ProductEngine
3b1e19d23e
Backed out changeset: 5816c800a9c1
...
Prervious MAINT-2141 fix causes MAINT-6791 so reverted it
2016-10-26 02:31:16 +03:00
Mnikolenko Productengine
3b328a3880
MAINT-6929 [Contribution] E-mail links are not parsed correctly when top level domain is over 6 characters.
2016-11-15 13:00:47 +02:00
andreykproductengine
b6e7708d60
MAINT-6912 Specifying physics mesh was resetting previous model name
2016-11-10 12:51:06 +02:00
Mnikolenko Productengine
5921cc9d8a
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2016-11-09 14:20:46 +02:00
andreykproductengine
a433c05bb0
MAINT-6911 Fixes viewer crash after using "Clear settings & reset form"
2016-11-07 21:03:05 +02:00
Mnikolenko Productengine
6083fd1cbe
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-07 12:33:14 +02:00
andreykproductengine
28c9002e98
MAINT-6906 Editing landmark name removes the land mark coordinates
2016-11-04 15:20:01 +02:00
AndreyL ProductEngine
97c372047c
Merged in lindenlab/viewer-bear
2016-10-27 21:10:46 +03:00
AndreyL ProductEngine
f5f4b771f1
Merged in lindenlab/viewer-bear
2016-09-30 17:44:38 +03:00
Mnikolenko Productengine
70a82ac3df
MAINT-6773 Add payment message
2016-09-28 12:35:34 +03:00
AndreyL ProductEngine
7a7dc795f6
MAINT-6744 'System UI size factor has changed... ' shouldn't appear after installation
2016-09-26 00:58:25 +03:00
AndreyL ProductEngine
741194085a
MAINT-6752 Updated contributions.txt
2016-09-23 00:50:16 +03:00
Mnikolenko Productengine
d6b0db5118
MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
2016-08-26 17:02:32 +03:00
Cinder
ca9d39c6c7
SL-3404 Don't send ParcelPropertiesRequest on every cursor position change
2016-08-25 13:42:37 -05:00
andreykproductengine
c4e9fe9fe5
MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name
2016-08-25 15:40:33 +03:00