summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-30 20:01:03 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-30 20:01:03 -0800
commitfaae38daaaf30fd96b217316cf3eafb095ff35bc (patch)
treee73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/llcommon/llmemory.h
parent6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff)
parente7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff)
Pull merge from lindenlab/viewer-developement
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());