Merge branch 'master' of git://github.com/singularity-viewer/SingularityViewer

2013-05-12 10:08:49 -07:00
parent 075bbe6831 54983bcc89
commit eef53e3eac
83 changed files with 3348 additions and 1922 deletions
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -403,8 +403,8 @@ void LLCondition::broadcast()

 //============================================================================
 LLMutexBase::LLMutexBase() :
-	mLockingThread(AIThreadID::sNone),
-	mCount(0)
+	mCount(0),
+	mLockingThread(AIThreadID::sNone)
 {
 }