Merge branch 'master' of git://github.com/siana/SingularityViewer.git

indra/llcommon/aithreadsafe.h

@@ -278,7 +278,11 @@ struct AIReadAccessConst
 protected:
 	//! Constructor used by AIReadAccess.
 	AIReadAccessConst(AIThreadSafe<T>& wrapper, state_type state)
-		: mWrapper(wrapper), mState(state) { }
+		: mWrapper(wrapper), mState(state) 
+#if AI_NEED_ACCESS_CC
+		  ,	mIsCopyConstructed(false)
+#endif
+	{ }
 
 	AIThreadSafe<T>& mWrapper;	//!< Reference to the object that we provide access to.
 	state_type const mState;	//!< The lock state that mWrapper is in.

indra/llcommon/llsdserialize.cpp

@@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
 	}
 
 	case LLSD::TypeUUID:
+	{
 		ostr.put('u');
-		ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
+		LLUUID d = data.asUUID();
+		ostr.write((const char*)(&(d.mData)), UUID_BYTES);
 		break;
+	}
 
 	case LLSD::TypeString:
 		ostr.put('s');

indra/llcommon/llthread.h

@@ -179,6 +179,10 @@ public:
 
 protected:
 	AIAPRPool mPool;
+private:
+	// Disable copy construction, as si teh bomb!!! -SG
+	LLMutex(const LLMutex&);
+	LLMutex& operator=(const LLMutex&);
 };
 
 #if APR_HAS_THREADS

indra/llcommon/llversionviewer.h

@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 5;
 const S32 LL_VERSION_PATCH = 8;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 1;
 
 const char * const LL_CHANNEL = "Singularity";