diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-03-09 12:48:52 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-03-09 12:48:52 -0600 |
| commit | 0e954a9afd7cc300bdd4cadfc25baa7f2607e5a4 (patch) | |
| tree | 79c976e2bacf64f061f6cce20d248af89eb92103 /indra/newview/llappviewer.cpp | |
| parent | 2b2a5da0990def249dc028e0bb842843e51feed1 (diff) | |
SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit builds.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 66c44ef6a6..61fc693b99 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1309,10 +1309,13 @@ void LLAppViewer::initMaxHeapSize() //------------------------------------------------------------------------------------------ //currently SL is built under 32-bit setting, we set its max heap size no more than 1.6 GB. - //F32 max_heap_size_gb = llmin(1.6f, (F32)gSavedSettings.getF32("MaxHeapSize")) ; - F32Gigabytes max_heap_size_gb = (F32Gigabytes)gSavedSettings.getF32("MaxHeapSize") ; + #ifndef LL_X86_64 + F32Gigabytes max_heap_size_gb = (F32Gigabytes)gSavedSettings.getF32("MaxHeapSize") ; +#else + F32Gigabytes max_heap_size_gb = (F32Gigabytes)gSavedSettings.getF32("MaxHeapSize64"); +#endif - LLMemory::initMaxHeapSizeGB(max_heap_size_gb); + LLMemory::initMaxHeapSizeGB(max_heap_size_gb); } static LLTrace::BlockTimerStatHandle FTM_MESSAGES("System Messages"); |