2057fa9716
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 18:10:48 +01:00
f047e2236c
Merge branch 'master' into DRTVWR-522-maint
2021-02-01 22:14:56 +02:00
cd831c4228
Merge branch 'master' into DRTVWR-516-maint
2021-02-01 22:11:04 +02:00
339c3c5df4
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-18 18:55:37 +01:00
fd290b8fdf
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 13:31:21 +01:00
dec231827b
SL-14543 Fix reason in environments 'settings couldn't be applied' error
2020-12-13 13:32:20 +02:00
d561756d58
SL-14497 Unblocking does not remove voice block
2020-12-08 23:25:34 +02:00
4fd188150b
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-13 18:20:46 +01:00
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
caf7f6c1d2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:53:39 +01:00
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
1570415819
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 13:51:44 +02:00
32b5aa20c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-14 23:48:24 +02:00
b12a9b89eb
Don't need those...
2020-10-14 22:19:18 +02:00
915f9b1e84
Make EEP water de-render function disabled by default
2020-10-14 20:43:07 +01:00
fbef48c913
Allow EEP assets to disable water rendering
...
This is the underlying support for manual use, UI to follow
2020-10-14 12:50:03 +01:00
f0bfb90056
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 23:33:22 +02:00
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
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
b193defea8
SL-13923 - EEP sky is wrong after loading water then re-logging with EnvironmentPersistAcrossLogin
2020-09-16 05:36:22 +03:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
f5cf69ee1d
FIRE-29926 - Transition time for manual Env change
2020-08-16 14:59:58 +01:00
60b57dd764
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-17 09:21:01 +02:00
5846f820a0
Only load legacy Windlights if actually in OpenSim - this probably might be tied to a region cap in case OpenSim gets EEP support eventually...
2020-06-16 20:32:37 +02:00
3d00f56ea0
Move unescaped_name function to FSCommon
2020-06-16 20:09:04 +02:00
4633a50fe4
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-16 12:58:04 +02:00
dc5ff7f272
OPENSIM Add user windlights to quick prefs search
2020-06-14 23:59:45 +01:00
2083dbae82
Merge branch 'master'
2020-06-14 22:11:54 +02:00
b0e3bb9184
Merge branch 'viewer/build' into rlva/development
2020-06-11 17:48:32 +02:00
0fa2fde0b3
Round #1 : EEP in OS.
...
Basic changes to allow EEP viewer to operate in OpenSim.
These changes restore windlight support by converting to EEP
As OpenSim does not yet have EEP Asset support this can only be
done on-the-fly. Quickprefs and region windlight support should
now work.
windlight setting through the region floater will not work, editing windlight settings will also not work.
Windlight support is not allowed in Second Life.
2020-06-10 20:29:02 +01:00
fc110b4362
SL-13327 Crash at LLViewerRegion::getWaterHeight
2020-05-27 17:29:08 +03:00
e624d82873
SL-12963 Additional environment debug output
2020-05-08 23:00:51 +03:00
7f0b06e0ba
SL-13161 Fixed notification
2020-05-08 02:00:52 +03:00
e73725f229
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-04 19:54:42 +02:00
d90366171c
Make environment quick selection comboboxes show the correct current setting and replace the non-functional and buggy sun position & time offset with a button to open the new personal lighting floater
2020-04-29 22:37:19 +02:00
a7e5b8ecc9
Restore the @setenv restriction
2020-04-27 00:07:19 +02:00
4369d1cb2a
Merge branch 'DRTVWR-500' of https://bitbucket.org/lindenlab/viewer
2020-04-23 20:13:46 +02:00
6f3797fe3e
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2020-04-23 17:42:51 +02:00
d9783adba7
SL-13040 Fixed crash at EnvironmentPersistAcrossLogin
2020-04-20 22:03:06 +03:00
ee88ebf9e9
SL-13029 Fixed load order
2020-04-13 17:16:10 +03:00
483c459e2e
SL-13029 Environment update was not applying properly
2020-04-12 12:02:38 +03:00
12c68bac09
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-08 08:13:48 +02:00
0524a1a86f
SL-11368, fix missing water uniforms for low shader settings
2020-04-03 11:52:18 -06:00
846d78345c
Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer
2020-04-01 15:00:34 +02:00
6620211bff
SL-12911 Add Debug setting EnvironmentPersistAcrossLogin
2020-03-27 00:24:08 +02:00
a7849c6ec4
Removed obsolete and misleading variable
2020-03-27 00:24:07 +02:00
cb525012e7
Merge DRTVWR-440
2020-03-12 17:19:05 +01:00
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
3c158f981a
Merge DRTVWR-440
2020-01-31 12:44:28 +01:00
79dcb0fba3
SL-12208 [EEP] The Water Normal Map does not consistently render
2020-01-15 17:03:33 +02:00
1e5830f55f
Merge viewer-eep
2019-08-26 21:51:36 +02:00
1f656735d3
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
2019-08-26 11:43:45 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
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
02c3d2fe9b
Merge viewer-eep
2019-07-12 21:08:13 +02:00
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
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
ee229e0f0b
Merged in maxim_productengine/viewer-eep (pull request #406 )
...
SL-11279 and SL-11273 fixes
2019-05-28 16:23:56 +00:00
fdf0d49614
SL-11279 [EEP] Automatically toggle the beacon checkboxes
2019-05-28 18:06:08 +03:00
6aa393f7f5
SL-11287 [EEP] Importing certain legacy windlights give upload error
2019-05-24 21:17:41 +03:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
a39bc2d28c
Quickprefs: Improved day cycle slider
...
Added sliders for sun, but highly buggy
2019-04-05 03:24:24 -07:00
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
44fe6e7c5f
More changing doubles to floats to make VS happy.
2019-03-31 17:41:12 -07:00
58582fb621
SL-10672 Fixed Sun transitioned to image from previous keyframe
2019-03-15 14:44:52 +02:00
d8eff424a5
SL-10664
2019-03-02 07:17:46 -08:00
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
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
98d6d1969b
SL-10464: Request experience status on parcel change, strip if no longer allowed.
2019-02-13 17:01:17 -08:00
5d9915243b
SL-10406, SL-10464: Remove experience injections and destroy push environment when finished.
2019-02-12 14:44:37 -08:00
d5aba39882
Merge
2019-02-11 16:51:06 -08:00
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
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
ce40f88ecb
Better calculation of time remaining in span for track animator (from SL-10465)
2019-02-05 15:09:32 -08:00
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
c7e02b0835
SL-9925: Viewer now shows an error message if import from legacy windlight fails.
2019-01-30 14:36:46 -08:00
211ad31dc2
I hope this is the last one.
2019-01-23 14:44:44 -08:00
a7570ae344
More specifics OSX compile.
2019-01-23 14:12:29 -08:00
618af868db
More OSX template
2019-01-23 11:45:07 -08:00
f6b27a4a0c
More OSX pickyness.
2019-01-23 10:54:46 -08:00
a5392bb8e8
Found the issue.
2019-01-23 10:10:19 -08:00
5ac7441250
Mac is a bit picky
2019-01-23 09:13:06 -08:00
b465a5bf6f
SL-10387: Inject individual settings. Still freezes parcel/region settings.
2019-01-22 16:53:14 -08:00
f42ac5b94e
SL-10387: Move settings intjection to a setting object (and out of llEnvironment)
2019-01-22 09:24:11 -08:00
00d8caa359
SL-10279 Finalize drag and drop support
2019-01-10 22:11:11 +02:00
1871f03d12
SL-10067, SL-9917: Updated UUIDs for sun and moon textures and to corrected known skies.
2019-01-07 17:00:01 -08:00
8227a0b270
SL-10279: Rework the environment pannel. Still in progress.
2018-12-21 15:30:57 -08:00
634910f685
SL-10241: Group roll for changing environment.
2018-12-14 14:33:42 -08:00
9475a593a1
Merge
2018-12-12 14:07:56 -08:00
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
d4fe87cca4
SL-10091 Prevent info floater from re-requesting data when not open
2018-12-07 16:24:47 +02:00
76071d4fe8
SL-10091 EEP Filter out dupplicate refreshes and callbacks
2018-12-05 22:13:49 +02:00
d66012f85e
SL-9716 [EEP] "Use Shared Environment" does not enable when applying an environment to a parcel or region
2018-11-30 17:48:08 +02:00
29130c5483
SL-10093: Client code to support experiences changing an environment. Handle generic messages with "commands" to be executed.
2018-11-20 10:59:38 -08:00
bda785e8b1
SL-10033 [EEP] Use fast environment transition for teleports
2018-11-12 20:11:00 +02:00
8d333a0176
OSX Pedantics
2018-11-02 14:32:42 -07:00
51772e6083
SL-9886: Viewer send and receive new day_name(s) information in the environment protocol for viewer specified names on individual tracks.
2018-11-02 09:17:19 -07:00
659d14504f
SL-1476 EEP Better shader resets and transitions
2018-10-29 18:18:20 +02:00
8740368b0b
SL-9922 FIXED [EEP] The Day environment settings are changed when open the Water setting in ‘Fixed Environment’ editor
2018-10-23 17:52:00 +03:00
44cdf00bff
SL-1476 EEP parcel transition inconsistencies
2018-10-17 21:17:00 +03:00
Ansariel