Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions indra/newview/llviewerwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2330,14 +2330,22 @@ void LLViewerWindow::initWorldUI()
physical_mem = LLMemory::getMaxMemKB();
}

if (!gNonInteractive && physical_mem > MIN_PHYSICAL_MEMORY)
if (!gNonInteractive)
{
LL_INFOS() << "Preloading cef instances" << LL_ENDL;
if (physical_mem > MIN_PHYSICAL_MEMORY)
{
LL_INFOS() << "Preloading cef instances" << LL_ENDL;

LLFloaterReg::getInstance("destinations");
LLFloaterReg::getInstance("avatar_welcome_pack");
LLFloaterReg::getInstance("search");
LLFloaterReg::getInstance("marketplace");
LLFloaterReg::getInstance("destinations");
LLFloaterReg::getInstance("avatar_welcome_pack");
LLFloaterReg::getInstance("search");
LLFloaterReg::getInstance("marketplace");
}
else if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
{
// Preload the welcome pack for first-time login even on low end hardware
LLFloaterReg::getInstance("avatar_welcome_pack");
}
}
}

Expand Down
Loading