diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index b0cc64e59..c2b93ebed 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -102,7 +102,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
 	// Setting mStatus to STOPPED is done non-thread-safe, so it's
 	// possible that the thread is deleted by another thread at
 	// the moment it happens... therefore make a copy here.
-	char const* name = threadp->mName;
+	volatile char const* name = threadp->mName.c_str();
 	
 	// We're done with the run function, this thread is done executing now.
 	threadp->mStatus = STOPPED;
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 7939a0d56..c5c30a904 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -128,7 +128,7 @@ protected:
 	LLCondition*		mRunCondition;
 
 	apr_thread_t		*mAPRThreadp;
-	EThreadStatus		mStatus;
+	volatile EThreadStatus		mStatus;
 	U32					mID;
 
 	friend void AIThreadLocalData::create(LLThread* threadp);
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 85eaabee9..d2681503b 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -96,7 +96,6 @@
 #include "llstack.h"
 #include "llstat.h"
 #include "llstl.h"
-#include "llstrider.h"
 #include "llstring.h"
 #include "llstringtable.h"
 #include "llsys.h"