diff options
author | Jacek Antonelli | 2008-08-15 23:46:01 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:46:01 -0500 |
commit | ae88605f72ef43be7b619b8c1c11a508ebae5057 (patch) | |
tree | f27474fe2d1186124211e2a5b2ad31927a3ab5bc /linden/indra/newview/llfloaterhud.cpp | |
parent | Second Life viewer sources 1.20.13 (diff) | |
download | meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.zip meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.gz meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.bz2 meta-impy-ae88605f72ef43be7b619b8c1c11a508ebae5057.tar.xz |
Second Life viewer sources 1.20.14
Diffstat (limited to 'linden/indra/newview/llfloaterhud.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterhud.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp index 8b34cb9..3ec08e3 100644 --- a/linden/indra/newview/llfloaterhud.cpp +++ b/linden/indra/newview/llfloaterhud.cpp | |||
@@ -39,7 +39,6 @@ | |||
39 | 39 | ||
40 | // statics | 40 | // statics |
41 | LLFloaterHUD* LLFloaterHUD::sInstance = 0; | 41 | LLFloaterHUD* LLFloaterHUD::sInstance = 0; |
42 | std::string LLFloaterHUD::sTutorialUrl = ""; | ||
43 | 42 | ||
44 | ///---------------------------------------------------------------------------- | 43 | ///---------------------------------------------------------------------------- |
45 | /// Class LLFloaterHUD | 44 | /// Class LLFloaterHUD |
@@ -87,7 +86,9 @@ LLFloaterHUD::LLFloaterHUD() | |||
87 | language = gSavedSettings.getString("SystemLanguage"); | 86 | language = gSavedSettings.getString("SystemLanguage"); |
88 | } | 87 | } |
89 | 88 | ||
90 | std::string url = sTutorialUrl + language + "/"; | 89 | std::string base_url = gSavedSettings.getString("TutorialURL"); |
90 | |||
91 | std::string url = base_url + language + "/"; | ||
91 | mWebBrowser->navigateTo(url); | 92 | mWebBrowser->navigateTo(url); |
92 | } | 93 | } |
93 | 94 | ||
@@ -122,7 +123,7 @@ LLFloaterHUD::~LLFloaterHUD() | |||
122 | void LLFloaterHUD::show() | 123 | void LLFloaterHUD::show() |
123 | { | 124 | { |
124 | // do not build the floater if there the url is empty | 125 | // do not build the floater if there the url is empty |
125 | if (sTutorialUrl == "") | 126 | if (gSavedSettings.getString("TutorialURL") == "") |
126 | { | 127 | { |
127 | LLAlertDialog::showXml("TutorialNotFound"); | 128 | LLAlertDialog::showXml("TutorialNotFound"); |
128 | return; | 129 | return; |