diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-07-22 19:01:52 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-07-22 19:01:52 +0000 |
| commit | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/newview/llfloaterhud.cpp | |
| parent | ed386ae547c225e352c39e8d14921572ee534b0b (diff) | |
QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
Diffstat (limited to 'indra/newview/llfloaterhud.cpp')
| -rw-r--r-- | indra/newview/llfloaterhud.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp index c5cb6a91d5..2ef5ebfca0 100644 --- a/indra/newview/llfloaterhud.cpp +++ b/indra/newview/llfloaterhud.cpp @@ -17,7 +17,6 @@ // statics LLFloaterHUD* LLFloaterHUD::sInstance = 0; -std::string LLFloaterHUD::sTutorialUrl = ""; ///---------------------------------------------------------------------------- /// Class LLFloaterHUD @@ -44,7 +43,7 @@ LLFloaterHUD::LLFloaterHUD() setBackgroundOpaque(TRUE); // Position floater based on saved location - LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect"); + LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect2"); reshape(saved_position_rect.getWidth(), saved_position_rect.getHeight(), FALSE); setRect(saved_position_rect); @@ -65,7 +64,9 @@ LLFloaterHUD::LLFloaterHUD() language = gSavedSettings.getString("SystemLanguage"); } - std::string url = sTutorialUrl + language + "/"; + std::string base_url = gSavedSettings.getString("TutorialURL"); + + std::string url = base_url + language + "/"; mWebBrowser->navigateTo(url); } @@ -87,7 +88,7 @@ LLFloaterHUD* LLFloaterHUD::getInstance() LLFloaterHUD::~LLFloaterHUD() { // Save floater position - gSavedSettings.setRect("FloaterHUDRect", getRect() ); + gSavedSettings.setRect("FloaterHUDRect2", getRect() ); // Clear out the one instance if it's ours if (sInstance == this) @@ -100,7 +101,7 @@ LLFloaterHUD::~LLFloaterHUD() void LLFloaterHUD::showHUD() { // do not build the floater if there the url is empty - if (sTutorialUrl == "") + if (gSavedSettings.getString("TutorialURL") == "") { LLAlertDialog::showXml("TutorialNotFound"); return; |