From a40ee94cd6768445fdaeffd18bf4392e1398d42b Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Mon, 4 Apr 2011 10:00:29 -0600
Subject: [PATCH] fix the bug for mac and linux of continuously adjusting
 memory.

---
 indra/llcommon/llmemory.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 49e2cd9ac41..62db7e33852 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 
-- 
GitLab