From ea8fb7238e6f12383ee4bc081475fa6235637581 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 31 Mar 2007 01:41:19 +0000
Subject: svn merge -r 59364:59813
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/llcommon/llmemory.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'indra/llcommon/llmemory.cpp')

diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 1063de5a8c..addda19775 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -11,11 +11,6 @@
 #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;
-
 //----------------------------------------------------------------------------
 
 //static
-- 
cgit v1.2.3