SH-3406 WIP convert fast timers to lltrace system

fixes to merge

1 files changed, 2 insertions, 47 deletions

diff --git a/indra/llcommon/llmutex.cpp b/indra/llcommon/llmutex.cpp
index 2ce14b3a2e..e6beb9e680 100644
--- a/indra/llcommon/llmutex.cpp
+++ b/indra/llcommon/llmutex.cpp
@@ -86,7 +86,7 @@ void LLMutex::lock()
 #if LL_DARWIN
 	mLockingThread = LLThread::currentID();
 #else
-	mLockingThread = LLThread::sThreadIndex;
+	mLockingThread = LLThread::sThreadID;
 #endif
 }
 
@@ -129,7 +129,7 @@ bool LLMutex::isSelfLocked()
 #if LL_DARWIN
 	return mLockingThread == LLThread::currentID();
 #else
-	return mLockingThread == LLThread::sThreadIndex;
+	return mLockingThread == LLThread::sThreadID;
 #endif
 }
 
@@ -182,48 +182,3 @@ void LLCondition::broadcast()
 
 
 //============================================================================
-
-//----------------------------------------------------------------------------
-
-//static
-LLMutex* LLThreadSafeRefCount::sMutex = 0;
-
-//static
-void LLThreadSafeRefCount::initThreadSafeRefCount()
-{
-	if (!sMutex)
-	{
-		sMutex = new LLMutex(0);
-	}
-}
-
-//static
-void LLThreadSafeRefCount::cleanupThreadSafeRefCount()
-{
-	delete sMutex;
-	sMutex = NULL;
-}
-
-
-//----------------------------------------------------------------------------
-
-LLThreadSafeRefCount::LLThreadSafeRefCount() :
-mRef(0)
-{
-}
-
-LLThreadSafeRefCount::~LLThreadSafeRefCount()
-{ 
-	if (mRef != 0)
-	{
-		llerrs << "deleting non-zero reference" << llendl;
-	}
-}
-
-//============================================================================
-
-LLResponder::~LLResponder()
-{
-}
-
-//============================================================================