diff options
author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/llcommon/llmemory.h | |
parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) |
merge changes for 3.4.5
Diffstat (limited to 'indra/llcommon/llmemory.h')
-rw-r--r-- | indra/llcommon/llmemory.h | 4 |
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()); |