diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
| commit | cabbc19e95707400a7632498296cc1012b34bb0f (patch) | |
| tree | 00a1fc15e9fd2c2ee742951967cf37eff22ee47a /indra/newview/llviewertexturelist.cpp | |
| parent | 7bf2a1f5fef557e4531731c608c8dd924c97bc39 (diff) | |
| parent | 7449f4b6d770be9d56ee5fa3d20b6b59d816719c (diff) | |
DRTVWR-510: Fix merge conflict
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 06524847d1..561319ca5d 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1385,8 +1385,6 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl { max_texmem = (S32Megabytes)128; } - - LL_WARNS() << "VRAM amount not detected, defaulting to " << max_texmem << " MB" << LL_ENDL; } S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB(); // In MB @@ -1428,6 +1426,11 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem) return; //listener will re-enter this function } + if (gGLManager.mVRAM == 0) + { + LL_WARNS() << "VRAM amount not detected, defaulting to " << mem << " MB" << LL_ENDL; + } + // TODO: set available resident texture mem based on use by other subsystems // currently max(12MB, VRAM/4) assumed... |