livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,538 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

605 Commits (cc8af5f37df1e200bc0b55740887a99157066e35)

Author SHA1 Message Date
Maxim Nikolenko e1661fdcda SL-19160 Enable ALM ctrl when Atmospheric shaders are used 2023-02-08 01:39:56 +02:00
Maxim Nikolenko c43336d5ed SL-18930 Update Autotune panel 2023-01-27 01:33:11 +02:00
Maxim Nikolenko 6c418060c1 SL-18979 FIXED "Reset to recommended settings" should reset Maximum render time of Avatars nearby 2023-01-16 19:12:42 +02:00
Maxim Nikolenko 020bfa66ba SL-18923 Add Reset to default settings button 2023-01-10 22:55:47 +02:00
Mnikolenko Productengine 553a98723b Merge branch 'main' into DRTVWR-539 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/colors.xml
 2022-12-13 08:05:03 +02:00
Mnikolenko Productengine 717b34f53f Merge branch 'master' into DRTVWR-539 
# Conflicts:
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
 2022-10-21 14:42:53 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Mnikolenko Productengine dcd74c98dc SL-18202 impostor too slow avatars and add autotune settings button to Preference 2022-09-27 19:35:49 +03:00
Mnikolenko Productengine 3098d315a3 SL-18202 remove old autofps 2022-09-23 16:49:47 +03:00
Mnikolenko Productengine b66f2e7da7 SL-18202 WIP merging autotune contribution and updating UI 2022-09-21 21:19:17 +03:00
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Andrey Lihatskiy 55da4ea8bb Merge branch 'master' into DRTVWR-565-maint-P 
# Conflicts:
#	indra/newview/llfloateroutfitsnapshot.cpp
 2022-08-31 00:36:22 +03:00
Andrey Lihatskiy a9a63db0f0 Merge branch 'master' into DRTVWR-548-maint-N 2022-08-31 00:17:37 +03:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 00:16:09 +03:00
Mnikolenko Productengine 3f3735c1f8 SL-17851 Highlight matching notifications when using Search Box in Preference 2022-08-02 14:59:04 +03:00
Mnikolenko Productengine d7b4a15a12 SL-17569 restore previous list of ignored notifications after pressing the Cancel button 2022-07-20 19:46:57 +03:00
Andrey Kleshchev ed36165f29 SL-17584 Frame buffer object is now nessesary to run viewer 2022-06-15 18:03:11 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
 2022-05-26 02:56:29 +03:00
Andrey Kleshchev 39ab2fb3fe SL-16937 Replace sendAvatarPropertiesUpdate with profile cap in preferences 
To avoid data loss, old api trims profile descriptions
 2022-05-08 13:31:50 +03:00
Andrey Kleshchev 29de643ffd SL-15383 Controls table was empty after canceling advanced graphical settings 
Also causes crashes on SearchableControl::setHighlighted due to views not being there
 2022-04-26 22:02:00 +03:00
Mnikolenko Productengine 79c9a8a4b7 Merge branch 'DRTVWR-546' into DRTVWR-539 2022-04-26 16:03:03 +03:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546 
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
 2022-04-18 23:42:39 +03:00
Andrey Kleshchev ea0c810d2d SL-15312 Small tweaks for profiles 2022-04-18 23:39:21 +03:00
Mnikolenko Productengine 0aaf5284dc Merge branch 'master' into DRTVWR-539 
# 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-02 00:46:10 +02:00
Andrey Kleshchev 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
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
 2022-02-28 21:54:21 +02:00
Mnikolenko Productengine b50de18162 SL-16627 add auto-adjustment warning for affected settings 2022-01-25 19:43:32 +02:00
Mnikolenko Productengine 5146e95641 SL-16627 build fix 2022-01-24 18:38:25 +02:00
Mnikolenko Productengine d7603ffc9c SL-16627 AutoFPS first pass 2022-01-24 16:33:44 +02:00
Runitai Linden 5b04123aec Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539 
# Conflicts:
#	indra/llcommon/lltracerecording.h
#	indra/newview/llfloaterpreference.cpp
 2022-01-21 10:33:37 -06:00
Andrey Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Mnikolenko Productengine 2c3fb3d59b Merge branch 'master' into DRTVWR-539 2021-12-20 14:15:49 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Kleshchev 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
Mnikolenko Productengine bc95529003 SL-16369 Remove Hardware Skinning setting 2021-11-30 19:01:33 +02:00
Mnikolenko Productengine ef0b48ce5a SL-16119 Viewer should now direct IM 2 Email setting to web 2021-11-30 01:19:43 +02:00
Andrey Lihatskiy 49dd88e86c Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llviewerinput.cpp
 2021-11-19 04:45:15 +02:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Mnikolenko Productengine 132c536d9c Merge branch 'master' into DRTVWR-539 2021-11-16 17:44:15 +02:00
Andrey Lihatskiy 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
Andrey Kleshchev 709184e0ff SL-15993 Disabling transparent water should not disable advanced lighting 2021-11-12 17:34:27 +02:00
Andrey Kleshchev b41f6cd2b5 SL-15387 Resolve some columns crashes 
Looks like mColumnsIndexed had dead pointers which resulted in a crash and there is some kind of hard to trigger interaction with searchable UI
 2021-10-22 00:01:05 +03:00
Andrey Kleshchev 8d64a0da52 SL-15383 Crash at SearchableControl's setHighlighted 2021-10-22 00:00:54 +03:00
Mnikolenko Productengine f24682d851 SL-15667 FIXED Complexity value is not updated in Advanced floater 2021-07-23 15:18:11 +03:00
Andrey Kleshchev 84a0ae682a SL-15611 Do not ignore mask modifiers for mouse-teleporting 2021-07-21 22:15:12 +03:00
Mnikolenko Productengine 928191f525 SL-15297 performance floater UI update #2 2021-07-19 20:07:03 +03:00
Andrey Kleshchev b5d3a5b56a SL-15353 'Cancel' button does not cancel 'Only friends and groups can call or IM me' 2021-06-15 20:37:23 +03:00