| Age | Commit message (Collapse) | Author | 
 | 
# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp
 | 
 | 
 | 
 | 
LF, and trim trailing whitespaces as needed
 | 
 | 
# 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
 | 
 | 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/newview/lloutfitslist.cpp
 | 
 | 
Co-authored-by: AiraYumi <aira.youme@airanyumi.net>
 | 
 | 
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
 | 
 | 
 | 
 | 
 | 
 | 
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.
 | 
 | 
 | 
 | 
 | 
 | 
when passing LLPointers into functions. Only increment the refcount when
storing in new ImageRequest.
 | 
 | 
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().
 | 
 | 
lllfsthread threaded.
 | 
 | 
 | 
 | 
 | 
 | 
VAOs by default.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 | 
 | 
 | 
 | 
occlusion queries from previous frame are still pending and perform texture decode work.
 | 
 | 
 | 
 | 
 | 
 | 
Checker: CHECKED_RETURN
Function: LLImageDecodeThread::update(unsigned int)
File: /indra/llimage/llimageworker.cpp
 | 
 | 
 | 
 | 
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
 | 
 | 
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
 | 
 | 
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)
 | 
 | 
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
 | 
 | 
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
 | 
 | 
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
 | 
 | 
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
 | 
 | 
 |