summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-04-04 10:00:29 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-04-04 10:00:29 -0600
commita40ee94cd6768445fdaeffd18bf4392e1398d42b (patch)
tree4ab7d93b46be175ae6b278a8be9588db9ce354ce /indra/llcommon/llmemory.cpp
parentfc106df53085f549acdbb2f8149ca75e400532fa (diff)
fix the bug for mac and linux of continuously adjusting memory.
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
-rw-r--r--indra/llcommon/llmemory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 49e2cd9ac4..62db7e3385 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -140,10 +140,10 @@ void* LLMemory::tryToAlloc(void* address, U32 size)
llerrs << "error happens when free some memory reservation." << llendl ;
}
}
-#else
-#endif
-
return address ;
+#else
+ return 0x01 ; //skip checking
+#endif
}
//static