diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-07 16:14:31 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-07 16:14:31 -0600 |
| commit | adacf00aadaf9097c2293b6c6b9203b5f4f0c780 (patch) | |
| tree | 6022511fe314c3ffaa794fef99b213b592ecae96 /indra/newview/llappviewer.cpp | |
| parent | 42b9001e97298594f79b2145ac13df925d532a6d (diff) | |
| parent | a36b66bd145e99a8f597f1c7c3b48ca30bdd7029 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 0a9d6229ef..c3725b7075 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -709,7 +709,7 @@ bool LLAppViewer::init() //set the max heap size. initMaxHeapSize() ; - LLPrivateMemoryPoolManager::initClass((BOOL)gSavedSettings.getBOOL("MemoryPrivatePoolEnabled"), (U32)gSavedSettings.getU32("MemoryPrivatePoolSize")) ; + LLPrivateMemoryPoolManager::initClass((BOOL)gSavedSettings.getBOOL("MemoryPrivatePoolEnabled"), (U32)gSavedSettings.getU32("MemoryPrivatePoolSize")*1024*1024) ; // write Google Breakpad minidump files to our log directory std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""); |