50c7296d34
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
2023-12-01 11:27:42 +01:00
9eb885fd89
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/xui/de/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/es/panel_main_inventory.xml
# indra/newview/skins/default/xui/fr/panel_main_inventory.xml
# indra/newview/skins/default/xui/it/panel_main_inventory.xml
# indra/newview/skins/default/xui/ja/panel_main_inventory.xml
# indra/newview/skins/default/xui/pl/panel_main_inventory.xml
# indra/newview/skins/default/xui/ru/panel_main_inventory.xml
2023-10-04 12:45:40 +02:00
af9fe17089
SL-17135 Apr process creation crash
...
looks like pool regularly gets corrupted, try using separate pool
2023-10-03 21:14:34 +03:00
f7063cecdd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llappviewer.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
2022-12-14 10:13:07 +01:00
9c4c27a56f
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-08-01 22:07:39 +02:00
fe26a9d32c
SL-17868 Crash at ThreadRecorder::bringUpToDate
...
According to bugsplat get_thread_recorder was null
Replaced apr based LLThreadLocalPointer with thread_local
2022-07-30 02:57:30 +03:00
c5d9c3c2a7
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2022-06-03 15:07:06 +02:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
87dacc1ec1
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-25 16:13:23 +02:00
6a32a7551e
SL-13034 Last string in logs should say 'Goodbye'
...
These logs were not logging for very long due to supressed logging system, no point showing them now
2020-09-25 17:02:22 +03:00
b0b4f0e9c1
Merge viewer-neko
2019-12-01 13:55:07 +01:00
dcf8487e4c
SL-6621 Small rework, should also fix mNumTotalRef related asserts
2019-11-19 22:15:41 +02:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
92df9704a5
Set LLScopedLock::mLocked to false if it gets unlocked; Thanks to Henri Beauchamp for pointing at this
2018-07-30 22:33:51 +02:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
3ea9a01423
Change pointer to member where possible and do a bit of cleanup in lerror (move the mutexex in there and us the LLMutextTryLock rather than a custom class).
2018-04-06 09:49:32 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
1a788686ad
Merge Firestorm LGPL
2018-02-12 19:59:48 +01:00
ebb14abbd8
FIRE-13474: Fix Collada export to filenames containing brackets fail
2018-01-24 13:00:10 +01:00
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
fd2ccb1606
merge changes for 4.1.2-release
2016-11-16 09:52:59 -05:00
9260fbe0bd
add location details to apr status logging
2016-07-21 15:38:55 -04:00
04039bd5df
Merge viewer-bear
2016-06-16 00:05:04 +02:00
0a7144c870
MAINT-5040 Warning "ll_apr_warn_status: APR: Connection refused" continually appears on Linux
2016-06-14 13:47:27 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
fa96509726
Cleanup.
2016-01-27 10:02:48 +01:00
f2d1ad0b3b
Remove ndfile, as the new apr can handle utf8 filenames on Windows.
2016-01-26 23:36:53 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
d75667560c
Silence spurious asserts when pool is cleared at exactly it's limit
2013-06-15 07:19:23 -07:00
6b2a22e11c
MAINT-2777 work-around for APR assert_always causing random crash in materials build
2013-06-10 16:55:05 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d8b44ed2f7
Make sure marker files always get properly flushed after write.
2013-11-02 03:13:17 +01:00
5519c39beb
Merge Viewer-bear (Materials 3.6.6 RC)
2013-09-16 16:18:33 -07:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
62a9f557d2
SH-3406 WIP convert fast timers to lltrace system
...
moved thread local storage to its own cpp file
2013-01-11 10:16:26 -08:00
3c341a11ab
SH-3468 WIP add memory tracking base class
...
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
2013-01-08 00:25:07 -08:00
6841351502
SH-3468 WIP add memory tracking base class
...
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
2013-01-06 21:37:31 -08:00
cda2cdda51
SH-3406 WIP convert fast timers to lltrace system
...
made fast timer stack thread local
added LLThreadLocalSingleton
made LLThreadLocalPointer obey pointer rules for const
added LLThreadLocalSingletonPointer for fast thread local pointers
2013-01-03 00:30:54 -08:00
3fd640a6e3
SH-3468 WIP add memory tracking base class
...
fixed crash on exit by making LLInstanceTracker iterators use atomic iterator
nesting count for thread safety
2012-12-23 12:27:25 -08:00
013f04cabe
SH-3468 WIP add memory tracking base class
...
improvements on lifetime of lltrace core data structures
tweaks to thread local pointer handling so that static constructors/destructors
can safely call functions that use lltrace
2012-12-21 00:13:21 -08:00
dbe9742703
SH-3404 create sampler class
...
renamed LLTrace::ThreadTrace to LLTrace::ThreadRecorder
renamed LLTrace::Sampler to LLTrace::Recording
2012-10-02 15:37:16 -07:00
14b1b0b2bb
SH-3275 WIP Run viewer metrics for object update messages
...
cleaned up API
samplers are now value types with copy-on-write buffers under the hood
removed coupling with LLThread
2012-10-01 19:39:04 -07:00
05a3203d82
SH-3275 WIP Run viewer metrics for object update messages
...
fixed various issues related to unit tests and LLThreadLocalPtr initialization and teardown
2012-09-26 17:04:57 -07:00
Ansariel