summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateravatarwelcomepack.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-10-28 21:11:54 +0200
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-10-29 17:54:31 +0200
commit0fd96e62471a4d6c95c5c3a8d6e1de0e59c83379 (patch)
treeb7b28fe47ae287b418d0af1cbd2ec4fa893edcf6 /indra/newview/llfloateravatarwelcomepack.cpp
parent5a0ba25d83862e7d220c1ae62173b537b7db5b52 (diff)
#4604 Turn off cef preloading on low end hardware
1. Cef instances are fairly heavy in viewer's implementation, don't preload them on systems <= 8GB 2. Move initialization into floaters where it belongs. 3. Minimal requirement is 8GB, drop gpu class to 1 on hardware under 8GB 4. Reduce cef instance count on systems under 8GB
Diffstat (limited to 'indra/newview/llfloateravatarwelcomepack.cpp')
-rw-r--r--indra/newview/llfloateravatarwelcomepack.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarwelcomepack.cpp b/indra/newview/llfloateravatarwelcomepack.cpp
index 82e44d1398..be384bf4d1 100644
--- a/indra/newview/llfloateravatarwelcomepack.cpp
+++ b/indra/newview/llfloateravatarwelcomepack.cpp
@@ -28,8 +28,10 @@
#include "llviewerprecompiledheaders.h"
#include "llfloateravatarwelcomepack.h"
-#include "lluictrlfactory.h"
#include "llmediactrl.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "llweb.h"
LLFloaterAvatarWelcomePack::LLFloaterAvatarWelcomePack(const LLSD& key)
: LLFloater(key)
@@ -52,6 +54,10 @@ bool LLFloaterAvatarWelcomePack::postBuild()
if (mAvatarPicker)
{
mAvatarPicker->clearCache();
+ mAvatarPicker->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
+ std::string url = gSavedSettings.getString("AvatarWelcomePack");
+ url = LLWeb::expandURLSubstitutions(url, LLSD());
+ mAvatarPicker->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
}
return true;