38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
eab5beb54c
Merge branch 'main' into marchcat/x-merge
...
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
da48bd9439
SL-18721 Shutdown fixes #2
...
Set DONE if decode thread is down instead of waiting for an update.
Decodes can't be canceled, so fix potential situation where we get two
responses
2024-01-23 13:01:39 +02:00
305fe845c6
SL-20779 More reliable decode and encode error logging ( #615 )
2024-01-09 23:16:57 +02:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
026ef1935d
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
...
Rather than continuing to propagate try/catch (Closed)
(aka LLThreadSafeQueueInterrupt) constructs through the code base, make
WorkQueueBase::post() return bool indicating success (i.e. ! isClosed()).
This obviates postIfOpen(), which no one was using anyway.
In effect, postIfOpen() is renamed post(), bypassing the exception when
isClosed().
Review existing try/catch blocks of that sort, changing to test for post()
returning false.
2023-05-08 12:07:31 -04:00
6954aafb5d
Fix uncaught LLThreadSafeQueueInterrupt during ImageWorker threadpool shutdown
2023-05-05 17:20:48 -04:00
5a74f7648a
DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits.
2022-11-03 15:18:32 -04:00
3b043d90b6
SL-17483: Per review feedback, avoid LLPointer refcount twiddling
...
when passing LLPointers into functions. Only increment the refcount when
storing in new ImageRequest.
2022-06-13 15:18:14 -04:00
50dca86f64
SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool.
...
Remove all references to LLQueuedThread (but emulate a couple bits of its API
such as handle_t and getPending()).
Migrate ImageRequest into llimageworker.cpp. It has never been part of
LLImageDecodeThread's public API. Remove ImageRequest tests.
Remove all references to LLImageDecodeThread::pause(). The idea of pausing
another thread is bizarre to me, and LLThreadPool has no such operation. Nor
does it have an abortRequest().
2022-06-09 12:06:23 -04:00
fc7b5549cb
SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make lllfsthread threaded.
2022-05-31 16:54:05 -05:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
bf0643e28a
SL-16606: Add profiler category TEXTURE
2022-01-14 11:50:21 -08:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
794cc247e6
MAINT-4755 FIXED Asset on Screen Causes Sudden FPS Drop
2014-12-23 17:17:31 +02: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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
78233d1bf9
SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occlusion queries from previous frame are still pending and perform texture decode work.
2011-12-05 17:55:40 -06:00
436fe6a412
fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially)
2011-02-01 17:53:25 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
9fee359d1b
CID-3
...
Checker: CHECKED_RETURN
Function: LLImageDecodeThread::update(unsigned int)
File: /indra/llimage/llimageworker.cpp
2010-02-13 14:37:48 +00:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
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
222bca24c1
svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
...
this is a combined mergeback of the following branches as per QAR-841:
maint-server/maint-server-1 (absorbed by maint-server-2)
maint-server/maint-server-2
maint-server/maint-server-3
havok4/havok4-8
havok4/havok4-9
yes dataserver-is-deprecated
2008-09-05 22:03:35 +00:00
b5936a4b1d
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
...
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
b089fc559a
EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
...
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
e61a10ec5b
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-06-04 18:46:59 +00:00
b36dc36306
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-09 01:09:20 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
Andrey Lihatskiy