1 files changed, 6 insertions, 37 deletions

diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 9bfbf88..8528433 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -28,6 +28,12 @@
 #include "linden_common.h"
 
 #include "llmemory.h"
+#include "llmemtype.h"
+
+// not defining nullfunc will currently crash when trying to use a LLHandle
+template< typename _Ty >
+  const typename LLHandle< _Ty >::NullFunc
+    LLHandle< _Ty >::sNullFunc = LLHandle< _Ty >::defaultNullFunc;
 
 //----------------------------------------------------------------------------
 
@@ -258,43 +264,6 @@ void operator delete[] (void *p)
 
 //----------------------------------------------------------------------------
 
-//static
-LLMutex* LLThreadSafeRefCount::sMutex = 0;
-
-//static
-void LLThreadSafeRefCount::initClass()
-{
-        if (!sMutex)
-        {
-                sMutex = new LLMutex(0);
-        }
-}
-
-//static
-void LLThreadSafeRefCount::cleanupClass()
-{
-        delete sMutex;
-        sMutex = NULL;
-}
-        
-
-//----------------------------------------------------------------------------
-
-LLThreadSafeRefCount::LLThreadSafeRefCount() :
-        mRef(0)
-{
-}
-
-LLThreadSafeRefCount::~LLThreadSafeRefCount()
-{ 
-        if (mRef != 0)
-        {
-                llerrs << "deleting non-zero reference" << llendl;
-        }
-}
-
-//----------------------------------------------------------------------------
-
 LLRefCount::LLRefCount() :
         mRef(0)
 {