Merge branch 'project/gltf_development' into 1357-gltf-asset-prototype

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 0f48ce16b2..74b138a53b 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -506,7 +506,7 @@ namespace
         LLError::TimeFunction               mTimeFunction;
 
         Recorders                           mRecorders;
-        LLMutex                             mRecorderMutex;
+        LLCoros::Mutex                      mRecorderMutex;
 
         int                                 mShouldLogCallCounter;
 
@@ -1044,7 +1044,7 @@ namespace LLError
 			return;
 		}
 		SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-		LLMutexLock lock(&s->mRecorderMutex);
+		LLCoros::LockType lock(s->mRecorderMutex);
 		s->mRecorders.push_back(recorder);
 	}
 
@@ -1055,7 +1055,7 @@ namespace LLError
 			return;
 		}
 		SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-		LLMutexLock lock(&s->mRecorderMutex);
+		LLCoros::LockType lock(s->mRecorderMutex);
 		s->mRecorders.erase(std::remove(s->mRecorders.begin(), s->mRecorders.end(), recorder),
 							s->mRecorders.end());
 	}
@@ -1104,7 +1104,7 @@ namespace LLError
     std::shared_ptr<RECORDER> findRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        LLMutexLock lock(&s->mRecorderMutex);
+        LLCoros::LockType lock(s->mRecorderMutex);
         return findRecorderPos<RECORDER>(s).first;
     }
 
@@ -1115,7 +1115,7 @@ namespace LLError
     bool removeRecorder()
     {
         SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
-        LLMutexLock lock(&s->mRecorderMutex);
+        LLCoros::LockType lock(s->mRecorderMutex);
         auto found = findRecorderPos<RECORDER>(s);
         if (found.first)
         {
@@ -1221,7 +1221,7 @@ namespace
 
         std::string escaped_message;
 
-        LLMutexLock lock(&s->mRecorderMutex);
+        LLCoros::LockType lock(s->mRecorderMutex);
 		for (LLError::RecorderPtr& r : s->mRecorders)
 		{
             if (!r->enabled())