diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfloaterhud.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloaterhud.cpp')
| -rw-r--r-- | indra/newview/llfloaterhud.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp index 12b1f0b4f1..c5cb6a91d5 100644 --- a/indra/newview/llfloaterhud.cpp +++ b/indra/newview/llfloaterhud.cpp @@ -26,7 +26,7 @@ std::string LLFloaterHUD::sTutorialUrl = ""; // Default constructor LLFloaterHUD::LLFloaterHUD() -: LLFloater("floater_hud"), +: LLFloater(std::string("floater_hud")), mWebBrowser(0) { // Create floater from its XML definition @@ -59,7 +59,7 @@ LLFloaterHUD::LLFloaterHUD() // arrow keys during tutorial). mWebBrowser->setTakeFocusOnClick(false); - LLString language(gSavedSettings.getString("Language")); + std::string language(gSavedSettings.getString("Language")); if(language == "default") { language = gSavedSettings.getString("SystemLanguage"); @@ -97,7 +97,7 @@ LLFloaterHUD::~LLFloaterHUD() } // Show the HUD -void LLFloaterHUD::show() +void LLFloaterHUD::showHUD() { // do not build the floater if there the url is empty if (sTutorialUrl == "") @@ -112,7 +112,7 @@ void LLFloaterHUD::show() hud->setFrontmost(FALSE); } -void LLFloaterHUD::close() +void LLFloaterHUD::closeHUD() { if (sInstance) sInstance->close(); } |