diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-21 16:26:53 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-21 16:26:53 +0000 |
| commit | d47114e5cb39b7e5aa5308b705cd1a77727be7f3 (patch) | |
| tree | 892b2610e95ab23316d086941f9b3113569a5ee8 /indra/llcommon/llmemory.h | |
| parent | 1d25203cbf91bdf390ef9e9ae7c2b5d1b00bb7bb (diff) | |
| parent | d12305496f73e0b55e8e1ec327a2567ca713da22 (diff) | |
Merged in euclid-mDebugGPU (pull request #348)
Remove obsolete mDebugGPU variable and dependent code
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rw-r--r-- | indra/llcommon/llmemory.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index f04ae5f5cb..24f86cc11e 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -344,10 +344,9 @@ public: // Return value is zero if not known. static U64 getCurrentRSS(); static void* tryToAlloc(void* address, U32 size); - static void initMaxHeapSizeGB(F32Gigabytes max_heap_size, BOOL prevent_heap_failure); + static void initMaxHeapSizeGB(F32Gigabytes max_heap_size); static void updateMemoryInfo() ; static void logMemoryInfo(BOOL update = FALSE); - static bool isMemoryPoolLow(); static U32Kilobytes getAvailableMemKB() ; static U32Kilobytes getMaxMemKB() ; @@ -359,7 +358,6 @@ private: static U32Kilobytes sAllocatedPageSizeInKB ; static U32Kilobytes sMaxHeapSizeInKB; - static BOOL sEnableMemoryFailurePrevention; }; // LLRefCount moved to llrefcount.h |