694ba6602f
Merge branch 'main' of https://github.com/secondlife/viewer
2022-12-12 21:15:27 +01:00
6de5986333
SL-18718 Crash at LLEventPump::listen and connection issues
...
Cleaner reinit and termination.
2022-11-28 17:25:43 +02:00
a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
d248961c30
SL-17182 FIXED Viewer crashes after changing the environment settings
2022-04-11 17:51:10 +03:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
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
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
d36f1c75ad
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-03-03 15:08:10 +01:00
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
91346628f6
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-02-19 09:02:07 +01:00
18717562ee
SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5
2021-02-19 00:05:52 +02:00
dfc6ea61f2
Merge branch 'rlva/development'
2020-11-21 23:16:39 +01:00
c326edb942
[FIXED] @setenv_XXX commands are non-functional during environment transitions
2020-11-21 18:45:51 +01: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
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
e624d82873
SL-12963 Additional environment debug output
2020-05-08 23:00:51 +03: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
6f3797fe3e
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2020-04-23 17:42:51 +02:00
483c459e2e
SL-13029 Environment update was not applying properly
2020-04-12 12:02:38 +03: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
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
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
fdf0d49614
SL-11279 [EEP] Automatically toggle the beacon checkboxes
2019-05-28 18:06:08 +03:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
4554d2dbdf
Fixed QP/PT to support EEP moving day cycle and sun
...
Reformated the mess that was QP/PT XUI
2019-04-06 23:22:13 -07:00
a39bc2d28c
Quickprefs: Improved day cycle slider
...
Added sliders for sun, but highly buggy
2019-04-05 03:24:24 -07:00
f917c39b4f
Initial QP day cycle slider to see if method is viable
2019-04-04 02:13:55 -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
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
5d9915243b
SL-10406, SL-10464: Remove experience injections and destroy push environment when finished.
2019-02-12 14:44:37 -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
c7e02b0835
SL-9925: Viewer now shows an error message if import from legacy windlight fails.
2019-01-30 14:36:46 -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
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
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
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
Ansariel