summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhowto.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterhowto.cpp')
-rw-r--r--indra/newview/llfloaterhowto.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterhowto.cpp b/indra/newview/llfloaterhowto.cpp
index 665955c946..9db733db25 100644
--- a/indra/newview/llfloaterhowto.cpp
+++ b/indra/newview/llfloaterhowto.cpp
@@ -52,8 +52,11 @@ BOOL LLFloaterHowTo::postBuild()
void LLFloaterHowTo::onOpen(const LLSD& key)
{
LLFloaterWebContent::Params p(key);
- std::string url = gSavedSettings.getString("GuidebookURL");
- p.url = LLWeb::expandURLSubstitutions(url, LLSD());
+ if (!p.url.isProvided() || p.url.getValue().empty())
+ {
+ std::string url = gSavedSettings.getString("GuidebookURL");
+ p.url = LLWeb::expandURLSubstitutions(url, LLSD());
+ }
p.show_chrome = false;
LLFloaterWebContent::onOpen(p);