summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.h
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2013-01-30 15:25:09 -0800
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2013-01-30 15:25:09 -0800
commitee87ef23037f5e2904dfea3da061a9548cc113f5 (patch)
treed3aaa5405c97866529e2029572d81ebbd90b8d4a /indra/llcommon/llmemory.h
parent07b557cef909d74cd514b2d7e6b666edbfae3ef2 (diff)
parent60d1404b212824939b8bcd17fd2cc1e46e9bac55 (diff)
merge downstream code from viewer-lion
Diffstat (limited to 'indra/llcommon/llmemory.h')
-rw-r--r--indra/llcommon/llmemory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 10013e0f92..e725bdd9fa 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -26,7 +26,9 @@
#ifndef LLMEMORY_H
#define LLMEMORY_H
-#include "llmemtype.h"
+#include "linden_common.h"
+
+class LLMutex ;
#if LL_WINDOWS && LL_DEBUG
#define LL_CHECK_MEMORY llassert(_CrtCheckMemory());