08fe29a658
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-22 11:46:16 +01:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
f571de9de4
SL-16606: Add profiler category NETWORK
2022-01-14 11:50:20 -08:00
352b820258
SL-16606: Add profiler category DRAWABLE
2022-01-14 11:50:19 -08:00
108f4c7cd4
SL-16644 OUT_FULL updates should reset cache
...
A revert of SH-4631
2022-01-14 08:46:18 +01:00
4cc5b249d8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-10 15:47:34 +01:00
850a65b032
FIRE-5496: Missing LI for objects outside agent's region
2021-12-07 17:13:49 +01: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
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
b78db5ae5c
SL-16014: Add Tracy markup to LLViewerObjectList
2021-09-22 14:38:43 -07:00
c10d601ce8
SL-15999 - track --noninteractive state with gNonInteractive flag
2021-09-20 13:19:20 +01:00
0918958507
SL-15999 - disable various types of loading in noninteractive mode
2021-09-17 16:45:56 +01:00
2fbf42c0aa
When the LI display in area search has been broken for 5 years and nobody noticed... :D
2021-04-12 20:44:16 +02:00
2a71ab5ed0
Retain the null check, restrict spam frequency of error
2021-02-25 17:46:02 +00:00
c4db86c551
more robust deadobject handling maybe
2021-02-25 15:37:17 +00:00
ff8ca8cc74
Move deadlist check right before trying to create an object
2021-02-24 10:41:18 +01:00
d464581410
Move dead object check to prevent log spam
2021-02-24 09:59:53 +01:00
b2d99d2b4a
Prevent re-creating dead, but not yet disposed objects, most likely due to random packet order
2021-02-24 09:40:13 +01:00
57b632efdd
FIRE-30694 - Make deadlist checks a little more water tight
...
Somewhat tentative checks to see if we still get out of step.
2021-02-15 02:30:18 +00:00
f1d20834e5
And even more unnecessary getInstance calls...
2020-10-13 10:41:21 +02:00
317c935339
Merge viewer-lynx
2019-11-12 19:19:42 +01:00
6ec37fac60
SL-12196 Crash at updateMeshTextures
2019-10-29 22:37:02 +02:00
f05a2fb77c
Merge viewer-bear
2019-07-20 20:40:10 +02:00
8d77d51e63
SL-10908 Safeguards and potential crash fix
2019-07-15 17:56:30 +03:00
e9a9f71e56
SL-10908 Safeguards and potential crash fix
2019-07-15 17:56:30 +03:00
b4ab48c849
Merge viewer-neko
2018-12-13 00:34:43 +01:00
4c92c7b2d0
SL-1481 Don't predict region crossings over a second
2018-12-04 17:52:46 +02:00
c910adf0e4
Changes to support Animesh kill switch.
...
removes all Animesh currently in view. Add to world menu. Available in tray
needs an icon TBD
2018-11-19 21:31:53 +00:00
921087c794
Auto-scaling amortisation of dynamic BB calcs
...
This fix limits the overhead of the new dynamic BB calcs to
AvatarExtentRefreshMaxPerBatch per AvatarExtentRefreshPeriodBatch frames
default is 5 avatar per 4 frames. Thus a standard busy region 25 avatars would
take 20 frames to refresh the BBs.
2018-11-15 00:25:16 +00:00
5e22507d2b
Merge Firestorm LGPL
2018-10-19 12:58:11 +02:00
56b578da18
SL-9649 Buffer safety checks for llviewerobject.cpp
2018-10-11 16:57:40 +03:00
3add6996ab
Merge Firestorm LGPL
2018-06-21 19:55:23 +02:00
e97c25531c
Merge viewer-neko
2018-05-25 22:05:19 +02:00
86ffcca293
MAINT-8674 Fixed logs
2018-05-25 16:01:59 +03:00
c10f8b1aa4
MAINT-8674 Clean up already requested ids.
2018-05-25 12:34:14 +00:00
08dbe24cde
Merge axon
2018-02-12 19:54:01 +01:00
e054f434cf
Merge Firestorm LGPL
2018-02-12 18:50:42 +01:00
e3c05a5d88
Manually pull fix for MAINT-8279 Fix for crash on unset pcode
2018-02-12 18:12:41 +01:00
9af10a84cf
MAINT-8239 - problems with some instances failing to load some joint positions. Added DumpXML and Reset Skeleton support for animated objects when debugging.
2018-02-02 20:32:43 +00:00
3a8b1bf1e4
SL-859 - exceptionally verbose logging of object state updates, likely temporary
2018-01-29 16:35:56 +00:00
120939f3a1
Merge axon
2018-01-16 20:26:58 +01:00
e1cf413793
SL-859 - debug logging
2018-01-04 15:06:40 +00:00
181482f26c
Merge Firestorm LGPL
2018-01-04 15:49:43 +01:00
acb603ed90
Merge Firestorm LGPL
2017-12-05 09:50:47 +01:00
102596b1f2
Reduce more log spam
2017-12-04 17:06:10 +01:00
6cd0f7fa51
Reduce log spam
2017-11-30 23:02:50 +01:00
eba0a1133f
Use timer for cleaning up dead objects
2017-12-16 19:24:37 +01:00
Ansariel