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

177 Commits (9f8763cae1ccb3577a2cd148ffc5cee564a2df65)

Author SHA1 Message Date
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
 2022-12-12 20:53:11 +02:00
Andrey Kleshchev 6de5986333 SL-18718 Crash at LLEventPump::listen and connection issues 
Cleaner reinit and termination.
 2022-11-28 17:25:43 +02:00
Andrey Lihatskiy 39e08b34b1 Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q 2022-11-01 23:11:57 +02:00
Rye Mutt d0e07c770b Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type. 2022-10-30 06:56:16 -04:00
Andrey Lihatskiy 91f9f2e9f7 DRTVWR-570 Mac build fix: unused variables cleanup 2022-10-27 23:08:09 +03:00
Rider Linden 73dc249ab6 SL-17663: Pass the water settings to the settings injector when an experience changes water settings. 2022-06-24 16:33:54 -07:00
Mnikolenko Productengine d248961c30 SL-17182 FIXED Viewer crashes after changing the environment settings 2022-04-11 17:51:10 +03:00
Andrey Kleshchev 50d9e332ac SL-15225 llSetAgentEnvironment cloud density transition doesn't work 2022-01-19 00:26:59 +02:00
Ptolemy 97552d2e75 SL-16606: Add profiler category SHADER 2022-01-14 11:50:20 -08:00
Ptolemy 2178d9fa57 SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
Nat Goodspeed 106d52c6ee SL-16202: Instantiate LLSimpleton::sInstance generically 
instead of requiring a separate declaration for each subclass.

The previous way produces errors in clang.

(cherry picked from commit 8458ad8890)
 2021-11-19 14:53:12 -05:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Dave Houlton 029b41c041 Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread" 
This reverts commit 5188a26a85, reversing
changes made to 819088563e.
 2021-11-15 09:25:35 -07:00
Nat Goodspeed 8458ad8890 SL-16202: Instantiate LLSimpleton::sInstance generically 
instead of requiring a separate declaration for each subclass.

The previous way produces errors in clang.
 2021-11-04 16:40:05 -04:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Dave Parks d2dce17803 SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead. 2021-10-19 02:26:41 +00:00
Andrey Lihatskiy 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
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 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
Andrey Kleshchev cfb6ca569b SL-15168 Viewer side functionality for guidebook window opening 2021-05-06 02:46:42 +03:00
Andrey Kleshchev 766ba20028 SL-15152 Crashfix: Do not update environments when quiting 2021-04-21 18:28:32 +03:00
Andrey Kleshchev c0f28ae362 SL-14927 Some avatar names not resolving 2021-03-18 23:01:04 +02:00
Andrey Kleshchev 14826e17dc SL-14654 [EEP] Aplying settings locally now is instant 
The 1 second fade makes it harder to compare different settings.
 2021-02-25 23:48:48 +02:00
Andrey Kleshchev 18717562ee SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5 2021-02-19 00:05:52 +02:00
Andrey Kleshchev 199f82786e SL-14675 Position changes shouldn't cause additional blends when environment isn't ready 2021-02-09 19:02:22 +02:00
Andrey Kleshchev fff8ab23a8 SL-14675 Teleporting to a new region can load the wrong EEP environment layer 2021-02-09 17:48:28 +02:00
Andrey Lihatskiy f047e2236c Merge branch 'master' into DRTVWR-522-maint 2021-02-01 22:14:56 +02:00
Andrey Lihatskiy cd831c4228 Merge branch 'master' into DRTVWR-516-maint 2021-02-01 22:11:04 +02:00
Andrey Kleshchev dec231827b SL-14543 Fix reason in environments 'settings couldn't be applied' error 2020-12-13 13:32:20 +02:00
Andrey Kleshchev d561756d58 SL-14497 Unblocking does not remove voice block 2020-12-08 23:25:34 +02:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
 2020-11-13 18:26:56 +02:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
 2020-11-11 22:14:24 +02:00
Andrey Kleshchev 26ef8e6c65 SL-14078 Validate region id for environments 
It is possible for agent to pass multiple region borders fast, resulting in environment updates affecting wrong regions
 2020-10-09 18:47:49 +03:00
Andrey Kleshchev b193defea8 SL-13923 - EEP sky is wrong after loading water then re-logging with EnvironmentPersistAcrossLogin 2020-09-16 05:36:22 +03:00
Andrey Kleshchev fc110b4362 SL-13327 Crash at LLViewerRegion::getWaterHeight 2020-05-27 17:29:08 +03:00
Andrey Kleshchev e624d82873 SL-12963 Additional environment debug output 2020-05-08 23:00:51 +03:00
Andrey Kleshchev 7f0b06e0ba SL-13161 Fixed notification 2020-05-08 02:00:52 +03:00
Andrey Kleshchev d9783adba7 SL-13040 Fixed crash at EnvironmentPersistAcrossLogin 2020-04-20 22:03:06 +03:00
Andrey Kleshchev ee88ebf9e9 SL-13029 Fixed load order 2020-04-13 17:16:10 +03:00
Andrey Kleshchev 483c459e2e SL-13029 Environment update was not applying properly 2020-04-12 12:02:38 +03:00
Dave Houlton 0524a1a86f SL-11368, fix missing water uniforms for low shader settings 2020-04-03 11:52:18 -06:00
Andrey Kleshchev 6620211bff SL-12911 Add Debug setting EnvironmentPersistAcrossLogin 2020-03-27 00:24:08 +02:00
Andrey Kleshchev a7849c6ec4 Removed obsolete and misleading variable 2020-03-27 00:24:07 +02:00
maxim_productengine 44f0cadad8 SL-12739 FIXED [EEP] Viewer is crashed after clicking the "Forget" button on the Experience Profile after the llSetAgentEnvironment was used 2020-02-27 15:30:09 +02:00
andreykproductengine 79dcb0fba3 SL-12208 [EEP] The Water Normal Map does not consistently render 2020-01-15 17:03:33 +02:00
Rider Linden 1f656735d3 SL-11705, SL-11706: New flags in llsettings base for tracking by simulator. 2019-08-26 11:43:45 -07:00
Graham Linden b507d63566 SL-11621 
Remove all references to unused shader var global_gamma.

Remove many unused decls for gamma from shaders.

Make post-deferred gamma correction use display_gamma.

Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
 2019-07-23 11:36:22 -07:00
Graham Linden 8ba159fed9 SL-11151, SL-11504 
Remove update threshold logic causing hiccups and rework sky updates.

Make deferred water do double transport again to match non-ALM rendering more closely.
 2019-06-27 09:10:38 -07:00
Graham Madarasz ee229e0f0b Merged in maxim_productengine/viewer-eep (pull request #406) 
SL-11279 and SL-11273 fixes
 2019-05-28 16:23:56 +00:00
maxim_productengine fdf0d49614 SL-11279 [EEP] Automatically toggle the beacon checkboxes 2019-05-28 18:06:08 +03:00