6cbca4da71
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-01 11:40:17 +01:00
3ef31cb9b2
SL-19203 et al -- Integrate SSR with reflection probes, tweak probe blending. ( #63 )
...
* SL-19203 WIP -- Integrate SSR with reflection probes. Decruft LLRenderTarget.
* SL-19203 WIP -- Re-integrate SSR. Incidental decruft.
* SL-19203 WIP -- SSR frame delta correction (still broken for Z)
* SL-19203 WIP -- SSR frame delta Z fix
* SL-19203 WIP -- Make SSR toggleable again and disable SSR in cube snapshots.
* SL-19203 WIP -- Soften sphere probe transitions and fix reflections on void water (make fallback probe a simple terrain+water+sky probe). Remove parallax correction for automatic probes to reduce artifacts.
* SL-19203 Tune probe blending.
* SL-19203 Cleanup.
2023-01-27 17:24:22 -06:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +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
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
ac94268e5e
Fix OpenGL core profile issue with glLineWidth by Rye Mutt
2020-10-18 02:21:58 +02:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
8dfb7d571e
Merge viewer-neko
2019-04-24 21:05:58 +02:00
cc464be2a7
SL-10828 [Dev tools] Scroll for fast timer
2019-04-22 16:05:06 +03:00
579b76dcf3
Merge viewer-neko
2019-04-15 12:40:44 +02:00
44e5b3a0e1
Undo fasttimer legend scroll feature for upcoming changes from LL
2019-04-15 11:38:24 +02:00
d329f6a9b8
SL-10828 [Dev tools] Fix Fast Timers' visibility
2019-04-04 15:53:40 +03:00
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
d82844dd18
MAINT-8302 Re-enabled exportCharts
2018-02-23 16:02:24 +02:00
06bce2ddd0
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
...
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
06db7c626f
Merge Firestorm LGPL
2017-10-11 17:58:16 +02:00
615336a4d4
Merge viewer-neko
2017-09-07 21:49:12 +02:00
13b6febd34
Merge viewer-64
2017-08-16 20:22:58 +02:00
57d5744f2c
MAINT-7634: Move StatsAccumulator into llcommon, collect data sent and error codes from core.
2017-07-28 14:07:25 -07:00
f8254a9d78
MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder.
2017-08-30 19:57:02 +03:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
3fed6c743a
Merge Firestorm LGPL
2016-11-11 16:04:29 +01:00
6bc8ab5968
MAINT-2465 FIXED Viewer crash when hovering in fast timers floater
2016-10-31 17:47:38 +02:00
348807d23d
MAINT-2465 FIXED Viewer crash when hovering in fast timers floater
2016-10-31 17:47:38 +02:00
0c7abda3c8
Merge bento-box
2016-09-14 23:25:42 +02:00
d07a8b9965
SL-124 - small comment cleanups
2016-09-02 08:41:22 -04:00
4acba68785
Merge bento-box
2016-08-11 00:16:36 +02:00
e0c2a4ac33
SL-126 - getting performance analysis into a non-crashing state
2016-07-15 10:52:29 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
19b1b5492b
Since I don't trust LL's arithmetics, better check for <> 0 here...
2015-07-31 17:15:57 +02:00
c25b398323
Added sanity checks for index out of range exceptions in fasttimer view - maybe it helps...
2015-07-21 12:31:47 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
7976d9e000
FIRE-15356: Crash fix in fast timers: mTimeBlock might be null
2015-01-21 13:52:46 +01:00
4ab7c54e44
Use Drake Arconis' memory fix for the fasttimer console - maybe this helps with some random rare crashes still happening
2015-01-10 15:45:17 +01:00
bdce32a02b
Update to build on Xcode 6.0: collection of removal of unused variables [-Wunused-variable]
2014-10-18 11:56:23 -07:00
a18f9c1b38
FIRE-14600: Proposed fix for crash in fasttimer view: mBars might be null
2014-11-14 23:15:46 +01:00
4cd8c24d07
Stop leaking insane amounts of memory in llfasttimerview.
2014-09-04 00:57:32 +02:00
f4e6f5a90f
Making the ledgend part of fast timers scrollable again after viewer-interesting merge
2014-06-29 18:56:34 -07:00
91a67f3c6b
User proper float type for initialization.
2014-06-10 23:31:22 +02:00
6ddfc8031c
BUILDFIX - miscellaneous stuff missed in the merge
2013-11-12 11:42:06 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
237627181d
always dump entire fast timer log on right click...not just visible timers
2013-10-29 19:05:28 -07:00
ab43be5ddb
moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimer
...
updates appearance utility dependency
2013-10-23 13:24:47 -07:00
1c26d42656
moved tree iterators into llfasttimer.h
2013-10-16 16:42:27 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
f8a85003dd
more memory optimizations of lltrace
2013-10-03 19:04:51 -07:00
Ansariel