llcommon merge. Added LLUnits.

2016-04-06 01:31:20 -05:00
parent 0fa7848b19
commit 0841479ccc
66 changed files with 1895 additions and 621 deletions
--- a/indra/llcommon/llrefcount.cpp
+++ b/indra/llcommon/llrefcount.cpp
@@ -31,15 +31,15 @@

 #if LL_REF_COUNT_DEBUG
 #include "llthread.h"
-#include "llapr.h"
 #endif

-LLRefCount::LLRefCount(const LLRefCount& other)
-:	mRef(0)
-{
+LLRefCount::LLRefCount(const LLRefCount& other) :	
 #if LL_REF_COUNT_DEBUG
-	mCrashAtUnlock = FALSE ;
+	mMutex(),
+	mCrashAtUnlock(FALSE),
 #endif
+	mRef(0)
+{
 }

 LLRefCount& LLRefCount::operator=(const LLRefCount&)
@@ -49,11 +49,12 @@ LLRefCount& LLRefCount::operator=(const LLRefCount&)
 }

 LLRefCount::LLRefCount() :
+#if LL_REF_COUNT_DEBUG
+	mMutex(),
+	mCrashAtUnlock(FALSE),
+#endif
 	mRef(0)
 {
-#if LL_REF_COUNT_DEBUG
-	mCrashAtUnlock = FALSE ;
-#endif
 }

 LLRefCount::~LLRefCount()