diff --git a/indra/llcommon/aithreadsafe.h b/indra/llcommon/aithreadsafe.h index 810aa8c2f..2575ba25f 100644 --- a/indra/llcommon/aithreadsafe.h +++ b/indra/llcommon/aithreadsafe.h @@ -278,7 +278,11 @@ struct AIReadAccessConst protected: //! Constructor used by AIReadAccess. AIReadAccessConst(AIThreadSafe& wrapper, state_type state) - : mWrapper(wrapper), mState(state) { } + : mWrapper(wrapper), mState(state) +#if AI_NEED_ACCESS_CC + , mIsCopyConstructed(false) +#endif + { } AIThreadSafe& mWrapper; //!< Reference to the object that we provide access to. state_type const mState; //!< The lock state that mWrapper is in. diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index fa003afdd..97dac455e 100644 --- a/indra/llcommon/llthread.h +++ b/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