aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llmemory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/llmemory.cpp')
-rw-r--r--linden/indra/llcommon/llmemory.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 8528433..284c8e7 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2002-2007, Linden Research, Inc. 5 * Copyright (c) 2002-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -30,11 +31,6 @@
30#include "llmemory.h" 31#include "llmemory.h"
31#include "llmemtype.h" 32#include "llmemtype.h"
32 33
33// not defining nullfunc will currently crash when trying to use a LLHandle
34template< typename _Ty >
35 const typename LLHandle< _Ty >::NullFunc
36 LLHandle< _Ty >::sNullFunc = LLHandle< _Ty >::defaultNullFunc;
37
38//---------------------------------------------------------------------------- 34//----------------------------------------------------------------------------
39 35
40//static 36//static