Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,917 Commits 20 Branches 51 Tags
fefb40bda2c0b792fcf8ffbfa37eaaca5238689a
Commit Graph

285 Commits

Author SHA1 Message Date
Siana Gearz
73099edae3 Version 1.7.1 2012-08-21 22:06:23 +02:00
Siana Gearz
df1e9732d0 Developers, profile thy profiler! 2012-08-21 07:43:47 +02:00
Siana Gearz
6b8c58e3b5 Safe and probably pointless crash workarounds from FS and LL 2012-08-13 06:14:16 +02:00
Siana Gearz
7743843a27 Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer 
Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
 2012-08-09 03:46:03 +02:00
Siana Gearz
de74443d76 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
 2012-08-09 00:42:23 +02:00
Shyotl
58033d3cbc Added rebake navmesh button. Brought in rest of the underlying navmesh implementation. 2012-08-06 10:11:12 -05:00
Drake Arconis
dc5bfc1c41 Bit of cleanup 
More cleanup and updates to llcommon
Removed legacy code and files
 2012-08-02 23:19:07 -04:00
Drake Arconis
b151796e0e Updated LSL Funtions 
Updated the functions, constants, tooltips, etc for os,aa, and secondlife
 2012-08-02 05:38:23 -04:00
Siana Gearz
c3900ee4f3 Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer 
Conflicts:
	indra/newview/llvieweraudio.cpp
 2012-07-23 09:03:17 +02:00
Siana Gearz
e53af58d4a Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-07-22 23:31:19 +02:00
Aleric Inglewood
2830b35aa6 Avoid dead lock in LLQueuedThread::generateHandle / LLTextureFetchWorker::callbackDecoded 
Thead 1:

indra/llcommon/llqueuedthread.cpp:456:

452                     if (complete)
453                     {
454                             lockData();             // This locks LLThread::mRunCondition
455                             req->setStatus(STATUS_COMPLETE);
456                             req->finishRequest(true);

LLImageDecodeThread::ImageRequest::finishRequest calls:
    mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux);

LLTextureFetchWorker::DecodeResponder::completed calls:
    worker->callbackDecoded(success, raw, aux);

LLTextureFetchWorker::callbackDecoded calls:
    LLMutexLock lock(&mWorkMutex);                      // This locks LLTextureFetchWorker::mWorkMutex

Thread 2:

LLTextureFetchWorker::doWork calls:
    LLMutexLock lock(&mWorkMutex);                      // This locks LLTextureFetchWorker::mWorkMutex
    .
    .
    .
    mDecodeHandle = mFetcher->mImageDecodeThread->decodeImage(mFormattedImage, image_priority, discard, mNeedsAux, new DecodeResponder(mFetcher, mID, this));

LLImageDecodeThread::decodeImage calls:
    handle_t handle = generateHandle();

LLQueuedThread::generateHandle calls:
    lockData();                                         // This locks LLThread::mRunCondition
 2012-07-22 04:13:23 +02:00
Drake Arconis
0d3fab40e5 Further header cleanup and a few updates 
Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
 2012-07-21 03:01:42 -04:00
Drake Arconis
1e81966b89 Clean up and updates 
Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files

             /\_..._/\
             |/ \_/ \|
             | o.-.o |
             \ ( O ) /
             /'--U--'\
             |  .:.  | /\
             | /:;:\ |` /
   Drake     | |:;:| |-'
  Arconis   /  |'-'|  \
            `""`   `""`
 2012-07-20 08:13:07 -04:00
Drake Arconis
7721c6e3da Resolved issue with glibc 2.16 
Resolved issues introduced by changes made in glibc 2.16 removing the undocumented definition of struct siginfo from bits/siginfo.h
 2012-07-17 16:06:31 -04:00
Siana Gearz
891a330955 Version 1.7.0 2012-07-16 12:19:22 +02:00
Drake Arconis
edb144bd1d Fixed ugly workaround for compiler detection 
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
 2012-07-10 14:15:59 -04:00
Drake Arconis
cb0f4f8f10 Added support for Intel c++ Composer Xe 
Added support for building with Intel C++ Composer Xe
Fixed a warning thrown by it
 2012-07-08 10:29:28 -04:00
Lirusaito
9c61998dac Spelling fixes... 
to a header *sigh*
 2012-07-03 00:54:25 -04:00
Drake Arconis
947990c2ad Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-03 00:34:07 +00:00
Aleric Inglewood
e36042bb76 More that I forgot it extract from curlthreading2. 2012-07-03 02:33:09 +02:00
Drake Arconis
7ad1b8731d Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:25:40 +00:00
Aleric Inglewood
d66acdf240 Add the rest of sRunning too. 2012-07-02 23:22:42 +02:00
Drake Arconis
8eb319d3ba Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:08:04 +00:00
Drake Arconis
c464a8da30 Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers 
Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp
 2012-07-02 20:16:56 +00:00
Lirusaito
e6689f830a Update llstring, and fix an error only presented in debug builds. 2012-07-02 15:57:55 -04:00
Drake Arconis
ece9dda7b4 Initial support for the Clang compiler and numerous warning fixes 2012-07-02 19:45:41 +00:00
Lirusaito
24db228406 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
	indra/newview/llpaneleditwearable.h
 2012-07-02 04:14:52 -04:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Aleric Inglewood
221e3908b9 There is no need to use a pure virtual destructor, and doing so crashes libcwd when configured with --enable-alloc. 2012-06-27 04:27:09 +02:00
Aleric Inglewood
0bee4a922f Make sure that sRunning <= number of threads with status RUNNING. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
5996ff1fa2 Fixed a comment. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
e7a3a150a7 Add AIThreadSafeBits::wrapper_cast to cast wrapped object back to wrapper class. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
e9df867a21 Like the other AIThreadSafe* objects, disallow AIThreadSafeSingleThread copy/assign 2012-06-27 04:27:07 +02:00
Aleric Inglewood
4391614d6e AIThreadSafe* update. 
Updated/added documentation.
Removed AIThreadSafeWindowsHack that annoyed me (fix your compiler).
Don't use 'static' in anonymous namespace.
Use the AIThreadSafe*DC variants for default constructed objects,
as opposed to the AITHREADSAFE* macro's.
 2012-06-27 04:27:07 +02:00
Aleric Inglewood
d63c54cb78 Allow AIThreadSafe*DC classes to be constructed with zero or one parameter. 
Also, allow AIThreadSafeSingleThreadDC objects to auto convert
to it's underlaying type, to assign that type and to write it
directly to an ostream.
 2012-06-27 04:27:07 +02:00
Aleric Inglewood
058720824d Fixup of LLAtomic and LLThreadSafeRefCount 2012-06-27 04:27:07 +02:00
Aleric Inglewood
eb7615ad57 Merge branch 'master' into V2MultiWear 2012-06-27 04:26:44 +02:00
Lirusaito
0ad533d94d STORM-1870 and Have a space before old names in parentheses, like V3. 
Also small fixes, some spelling, some important; synchronize with upstream a bit..
Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
 2012-06-09 17:07:20 -04:00
Lirusaito
a82953d0d0 Few more GCC 4.7 fixes. 
include unistd when not on windows.
 2012-04-29 00:25:40 -04:00
Shyotl
b49ad1cd34 RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater. 2012-04-12 10:29:45 -05:00
Aleric Inglewood
b18bc08600 Add AIAccessConst, AISTAccess, AISTAccessConst, ... 
Also added AIThreadSafeSingleThread, AIThreadSafeSingleThreadDC
and AITHREADSAFESINGLETHREAD
 2012-03-13 16:32:10 +01:00
Aleric Inglewood
fffbda1b90 Add ASSERT_SINGLE_THREAD 2012-03-12 04:37:55 +01:00
Aleric Inglewood
8c721c4a69 Merge/collision fix. 
Belonged in previous commit really.
 2012-03-12 04:37:16 +01:00
Aleric Inglewood
87b8f6e076 Merge with siana/master. Resolved conflicts. 
Conflicts: removal of trailing space (to be the same as
viewer 3) in one instance collided with a patch of Siana.

I had moved isSelfLocked.
 2012-03-11 03:21:45 +01:00
Aleric Inglewood
52b4008968 Prepare synchronization with viewer-development. 
Synchronization will be complete after viewer-development
gets my LLAPRPool and LLAPRFile patch that I'm currently
working on.
 2012-03-06 23:10:43 +01:00
Aleric Inglewood
c1133cb932 Use LLAPRPool 
apr_pool_t* should not be used anywhere, except where a comment
explicitely says it's ok. This one apparently sneeked in in the
meantime.
 2012-03-06 17:04:05 +01:00
Siana Gearz
83a3bbb48e Fixies from viewer-development 2012-03-06 09:01:01 +01:00
Siana Gearz
8b6f462d13 Wholesale update of llmessage to V3.2 
Note that this removes message logger for now.
 2012-03-06 07:31:15 +01:00
Siana Gearz
a7d70878b7 Log threadcount together with memory 2012-02-29 16:03:11 +01:00
Aleric Inglewood
0450358df3 Clean up after Linden Lab 2012-02-23 18:50:28 +01:00