Commit Graph

161 Commits (83b4ea59fc8793ccbfb6b40ffff111de14ebd4d3)

Author SHA1 Message Date
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
andreykproductengine 6aa393f7f5 SL-11287 [EEP] Importing certain legacy windlights give upload error 2019-05-24 21:17:41 +03:00
Rider Linden e24237b6af SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications. 2019-04-03 14:52:59 -07:00
andreykproductengine 58582fb621 SL-10672 Fixed Sun transitioned to image from previous keyframe 2019-03-15 14:44:52 +02:00
Graham Linden d8eff424a5 SL-10664 2019-03-02 07:17:46 -08:00
Rider Linden 2401712d10 SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions. 2019-02-20 15:20:30 -08:00
Rider Linden 2108d5ee38 SL-10464: A couple last fixes dealing with region crossings. Environment Experiences are still stripped when changing regions. Even if destination region participates in the experience. 2019-02-14 16:19:39 -08:00
Rider Linden 98d6d1969b SL-10464: Request experience status on parcel change, strip if no longer allowed. 2019-02-13 17:01:17 -08:00
Rider Linden 5d9915243b SL-10406, SL-10464: Remove experience injections and destroy push environment when finished. 2019-02-12 14:44:37 -08:00
Rider Linden d5aba39882 Merge 2019-02-11 16:51:06 -08:00
Rider Linden 2a740309d0 SL-10406, SL-10464: Experience injections now have their own sub class of day instance (DayInjection) Montitors underlying environments and switches the sources as needed. 2019-02-11 16:50:15 -08:00
maxim_productengine a9dd57c351 SL-10456 FIXED [EEP] Viewer continues to show last EEP environment after teleporting from EEP to non-EEP region 2019-02-07 13:06:16 +02:00
Rider Linden ce40f88ecb Better calculation of time remaining in span for track animator (from SL-10465) 2019-02-05 15:09:32 -08:00
maxim_productengine fcf25b690f SL-10364 FIXED Parcel Sky Altitudes not set correct when opening About Land -> Environment for the first time upon region arrival 2019-02-01 18:33:55 +02:00
Rider Linden c7e02b0835 SL-9925: Viewer now shows an error message if import from legacy windlight fails. 2019-01-30 14:36:46 -08:00
Rider Linden 211ad31dc2 I hope this is the last one. 2019-01-23 14:44:44 -08:00
Rider Linden a7570ae344 More specifics OSX compile. 2019-01-23 14:12:29 -08:00