livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 

# Conflicts:
#	indra/newview/llviewertexture.cpp
master
Ansariel 2024-07-16 11:33:38 +02:00
parent dc1616add3 a447221d66
commit fde4d3eba0
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llcommon/llmemory.cpp
View File

@ -154,7 +154,7 @@ void LLMemory::updateMemoryInfo()
// <FS:Beq> 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();
// </FS:Beq>
}
@ -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;
// </FS:Beq>
return ;
}

2
indra/newview/fsfloaternearbychat.cpp
View File

@ -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();

2
indra/newview/llviewertexture.cpp
View File

@ -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)