Alexander Gavriliuk
ef9a494134
#1500 Better out of disk space handling
2024-07-18 09:42:59 +02:00
Ansariel
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
Ansariel
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Andrey Lihatskiy
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
Lars Næsbye Christensen
ba4e7b989b
llcommon: BOOL (int) to real bool/LSTATUS
2024-02-09 01:02:29 +02:00
Alexander Gavriliuk
74c8b028d4
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
2023-12-21 19:12:52 +01:00
Andrey Lihatskiy
0465c761a4
Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-11-30 12:28:26 +02:00
Andrey Lihatskiy
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
Andrey Kleshchev
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
Andrey Kleshchev
37246b99f6
SL-17135 Apr process creation crash
...
looks like pool regularly gets corrupted, try using separate pool
2023-09-15 20:33:55 +03:00
Brad Linden
eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
Andrey Kleshchev
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
Dave Parks
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
Andrey Kleshchev
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
andreykproductengine
dcf8487e4c
SL-6621 Small rework, should also fix mNumTotalRef related asserts
2019-11-19 22:15:41 +02:00
andreykproductengine
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
Oz Linden
fd2ccb1606
merge changes for 4.1.2-release
2016-11-16 09:52:59 -05:00
Oz Linden
9260fbe0bd
add location details to apr status logging
2016-07-21 15:38:55 -04:00
Mnikolenko Productengine
0a7144c870
MAINT-5040 Warning "ll_apr_warn_status: APR: Connection refused" continually appears on Linux
2016-06-14 13:47:27 +03:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Richard Linden
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
Graham Linden
d75667560c
Silence spurious asserts when pool is cleared at exactly it's limit
2013-06-15 07:19:23 -07:00
Graham Madarasz
6b2a22e11c
MAINT-2777 work-around for APR assert_always causing random crash in materials build
2013-06-10 16:55:05 -07:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
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
Richard Linden
adeeabfc13
SH-3275 WIP Run viewer metrics for object update messages
...
moved LLThreadLocalPtr to llapr
fixed various startup race conditions for LLThreadLocalPtr
2012-09-24 18:56:01 -07:00
Nat Goodspeed
e04f9ef109
SWAT-352: when loading lleventhost, call apr_dso_error() function.
...
In addition to its usual apr_sterror() function, APR defines a special
function specifically for errors relating to the apr_dso_*() functions.
Introduce ll_apr_warn_status() and ll_apr_assert_status() overloads accepting
apr_dso_handle_t* to call apr_dso_error() as well as apr_strerror() and log
its output. Use new ll_apr_warn_status() in LLAppViewer::loadEventHostModule()
for apr_dso_load() and apr_dso_sym() calls. Instead of shorthand
ll_apr_assert_status(), use with llassert_always() so check is still performed
even in Release build.
Add more lleventhost-related debugging output, e.g. full pathname of the DLL.
On Mac and Linux, call 'file' command to report nature of the DLL too.
2010-12-14 19:27:43 -05:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Xiaohong Bao
4682264ead
EXT-8447: FIXED: crash at LLTextureCache::writeEntryToHeaderImmediately(int,LLTextureCache::Entry &,bool) [secondlife-bin lltexturecache.cpp]
2010-08-06 09:29:33 -06:00
Tofu Linden
799e014f2a
Backed out changeset eaac19489aa6
...
Bao agreed with my initial version after all.
2010-04-15 20:31:56 +01:00
Tofu Linden
59446d5505
be gentler on negative-offset reads - just do nothing instead of asserting. from bao's review.
...
(transplanted from 061b8b55838634425455ebc4ac046462dfc0e5f1)
2010-04-15 19:40:58 +01:00
Tofu Linden
1c63896154
Supporting 'read from the end' doesn't make sense (to me), unlike 'write
...
from the end'.
Also, more comments.
Also, try to avoid a seek when offset==0 in read.
To be reviewed by Bao.
(transplanted from 60eb013221a83ff76054ab7dcb1d07c108f51a9d)
2010-04-15 18:00:00 +01:00
Xiaohong Bao
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
Adam Moss
9dfe0ca9a0
svn merge -r121194:121210
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
Brad Kittenbrink
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
Aaron Brashears
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
Steven Bennetts
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Steven Bennetts
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Eric Tulla
e77de5d685
Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
...
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00