Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 81 insertions, 81 deletions

diff --git a/indra/llcommon/llmutex.cpp b/indra/llcommon/llmutex.cpp
index d5c168a50d..40c651d9c1 100644
--- a/indra/llcommon/llmutex.cpp
+++ b/indra/llcommon/llmutex.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llmutex.cpp
  *
  * $LicenseInfo:firstyear=2004&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -57,95 +57,95 @@ void LLMutex::lock()
     // a stack trace that points here, put a breakpoint in on_main_coro and try again.
     llassert(LLCoros::on_main_coro());
 
-	if(isSelfLocked())
-	{ //redundant lock
-		mCount++;
-		return;
-	}
-	
-	mMutex.lock();
-	
+    if(isSelfLocked())
+    { //redundant lock
+        mCount++;
+        return;
+    }
+
+    mMutex.lock();
+
 #if MUTEX_DEBUG
-	// Have to have the lock before we can access the debug info
-	auto id = LLThread::currentID();
-	if (mIsLocked[id])
-		LL_ERRS() << "Already locked in Thread: " << id << LL_ENDL;
-	mIsLocked[id] = true;
+    // Have to have the lock before we can access the debug info
+    auto id = LLThread::currentID();
+    if (mIsLocked[id])
+        LL_ERRS() << "Already locked in Thread: " << id << LL_ENDL;
+    mIsLocked[id] = true;
 #endif
 
-	mLockingThread = LLThread::currentID();
+    mLockingThread = LLThread::currentID();
 }
 
 void LLMutex::unlock()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD;
 
-	if (mCount > 0)
-	{ //not the root unlock
-		mCount--;
-		return;
-	}
-	
+    if (mCount > 0)
+    { //not the root unlock
+        mCount--;
+        return;
+    }
+
 #if MUTEX_DEBUG
-	// Access the debug info while we have the lock
-	auto id = LLThread::currentID();
-	if (!mIsLocked[id])
-		LL_ERRS() << "Not locked in Thread: " << id << LL_ENDL;
-	mIsLocked[id] = false;
+    // Access the debug info while we have the lock
+    auto id = LLThread::currentID();
+    if (!mIsLocked[id])
+        LL_ERRS() << "Not locked in Thread: " << id << LL_ENDL;
+    mIsLocked[id] = false;
 #endif
 
-	mLockingThread = LLThread::id_t();
-	mMutex.unlock();
+    mLockingThread = LLThread::id_t();
+    mMutex.unlock();
 }
 
 bool LLMutex::isLocked()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	if (!mMutex.try_lock())
-	{
-		return true;
-	}
-	else
-	{
-		mMutex.unlock();
-		return false;
-	}
+    if (!mMutex.try_lock())
+    {
+        return true;
+    }
+    else
+    {
+        mMutex.unlock();
+        return false;
+    }
 }
 
 bool LLMutex::isSelfLocked()
 {
-	return mLockingThread == LLThread::currentID();
+    return mLockingThread == LLThread::currentID();
 }
 
 LLThread::id_t LLMutex::lockingThread() const
 {
-	return mLockingThread;
+    return mLockingThread;
 }
 
 bool LLMutex::trylock()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	if (isSelfLocked())
-	{ //redundant lock
-		mCount++;
-		return true;
-	}
-	
-	if (!mMutex.try_lock())
-	{
-		return false;
-	}
-	
+    if (isSelfLocked())
+    { //redundant lock
+        mCount++;
+        return true;
+    }
+
+    if (!mMutex.try_lock())
+    {
+        return false;
+    }
+
 #if MUTEX_DEBUG
-	// Have to have the lock before we can access the debug info
-	auto id = LLThread::currentID();
-	if (mIsLocked[id])
-		LL_ERRS() << "Already locked in Thread: " << id << LL_ENDL;
-	mIsLocked[id] = true;
+    // Have to have the lock before we can access the debug info
+    auto id = LLThread::currentID();
+    if (mIsLocked[id])
+        LL_ERRS() << "Already locked in Thread: " << id << LL_ENDL;
+    mIsLocked[id] = true;
 #endif
 
-	mLockingThread = LLThread::currentID();
-	return true;
+    mLockingThread = LLThread::currentID();
+    return true;
 }
 
 
@@ -328,7 +328,7 @@ void LLSharedMutex::unlockExclusive()
 // LLCondition
 //
 LLCondition::LLCondition() :
-	LLMutex()
+    LLMutex()
 {
 }
 
@@ -339,20 +339,20 @@ LLCondition::~LLCondition()
 void LLCondition::wait()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	std::unique_lock< std::mutex > lock(mMutex);
-	mCond.wait(lock);
+    std::unique_lock< std::mutex > lock(mMutex);
+    mCond.wait(lock);
 }
 
 void LLCondition::signal()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	mCond.notify_one();
+    mCond.notify_one();
 }
 
 void LLCondition::broadcast()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	mCond.notify_all();
+    mCond.notify_all();
 }
 
 
@@ -401,30 +401,30 @@ LLMutexTrylock::~LLMutexTrylock()
 LLScopedLock::LLScopedLock(std::mutex* mutex) : mMutex(mutex)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	if(mutex)
-	{
-		mutex->lock();
-		mLocked = true;
-	}
-	else
-	{
-		mLocked = false;
-	}
+    if(mutex)
+    {
+        mutex->lock();
+        mLocked = true;
+    }
+    else
+    {
+        mLocked = false;
+    }
 }
 
 LLScopedLock::~LLScopedLock()
 {
-	unlock();
+    unlock();
 }
 
 void LLScopedLock::unlock()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD
-	if(mLocked)
-	{
-		mMutex->unlock();
-		mLocked = false;
-	}
+    if(mLocked)
+    {
+        mMutex->unlock();
+        mLocked = false;
+    }
 }
 
 //============================================================================