diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index f7162bcf6e..fe205f24cc 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -154,7 +154,7 @@ void LLMemory::updateMemoryInfo() // align MemInfo across platforms // sAvailPhysicalMemInKB = U32Bytes(vmstat.free_count * page_size); // sMaxPhysicalMemInKB = LLMemoryInfo::getHardwareMemSize(); - avail_phys = U32Bytes(vmstat.free_count * page_size); + avail_phys = U32Bytes( (vmstat.free_count + vmstat.inactive_count) * page_size); sMaxHeapSizeInKB = LLMemoryInfo::getHardwareMemSize(); // } @@ -191,6 +191,13 @@ void LLMemory::updateMemoryInfo() { sAvailPhysicalMemInKB = U32Kilobytes(0); } + // debug log the memory info + LL_DEBUGS("MemoryInfo") << "Memory Info:" + << "Heap: " << sMaxHeapSizeInKB << "; " // Heap + << "Free: " << sAvailPhysicalMemInKB << "; " // Free + << "FS Use: " << sAllocatedMemInKB << "; " // In use by this instance right now + << "FS Max poss: " << sMaxPhysicalMemInKB << "; " // How much we could have (In use now + free) + << LL_ENDL; // return ; } diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp index 22e5c7ccb6..6836ba7ad8 100644 --- a/indra/newview/fsfloaternearbychat.cpp +++ b/indra/newview/fsfloaternearbychat.cpp @@ -405,7 +405,7 @@ void FSFloaterNearbyChat::openFloater(const LLSD& key) void FSFloaterNearbyChat::removeScreenChat() { - LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID); + LLNotificationsUI::LLScreenChannelBase* chat_channel = LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLNotificationsUI::NEARBY_CHAT_CHANNEL_UUID); if (chat_channel) { chat_channel->removeToastsFromChannel(); diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 503fd597a6..530e106a77 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -573,6 +573,7 @@ void LLViewerTexture::updateClass() if (isSystemMemoryForTextureLow()) { // System RAM is low -> ramp up discard bias over time to free memory + LL_DEBUGS("TextureMemory") << "System memory is low, use more aggressive discard bias." << LL_ENDL; if (sEvaluationTimer.getElapsedTimeF32() > MEMORY_CHECK_WAIT_TIME) { sDesiredDiscardBias += llmax(.1f, over_pct); // add at least 10% over-percentage @@ -581,6 +582,7 @@ void LLViewerTexture::updateClass() } else { + LL_DEBUGS("TextureMemory") << "System memory is plentiful, act normally." << LL_ENDL; sDesiredDiscardBias = llmax(sDesiredDiscardBias, 1.f + over_pct); if (sDesiredDiscardBias > 1.f)