summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-01-12 07:51:14 -0800
committerXiaohong Bao <bao@lindenlab.com>2011-01-12 07:51:14 -0800
commitbcb5b209d1813681202524362dd186c8b0982357 (patch)
treee2d8c8c6448f2476123fd8e590665f7f20fe1a20 /indra/newview
parent7daa3d1ca10199468946feef0ce8eb67489deee0 (diff)
trivial: fix some mac compiling errors
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 664ec7b0fb..c3122504cc 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -977,7 +977,7 @@ void LLAppViewer::initMaxHeapSize()
void LLAppViewer::checkMemory()
{
const static F32 MEMORY_CHECK_INTERVAL = 1.0f ; //second
- const static F32 MAX_QUIT_WAIT_TIME = 30.0f ; //seconds
+ //const static F32 MAX_QUIT_WAIT_TIME = 30.0f ; //seconds
const static U32 MAX_SIZE_CHECKED_MEMORY_BLOCK = 64 * 1024 * 1024 ; //64 MB
//static F32 force_quit_timer = MAX_QUIT_WAIT_TIME + MEMORY_CHECK_INTERVAL ;
static void* last_reserved_address = NULL ;