diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/llfloaterhud.cpp | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/llfloaterhud.cpp')
| -rw-r--r-- | indra/newview/llfloaterhud.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp index 9810bf1009..4379d25a66 100644 --- a/indra/newview/llfloaterhud.cpp +++ b/indra/newview/llfloaterhud.cpp @@ -52,7 +52,7 @@ LLFloaterHUD* LLFloaterHUD::sInstance = 0; // Default constructor LLFloaterHUD::LLFloaterHUD() -: LLFloater(std::string("floater_hud")), +: LLFloater(), mWebBrowser(0) { // Create floater from its XML definition @@ -69,11 +69,6 @@ LLFloaterHUD::LLFloaterHUD() // Opaque background since we never get the focus setBackgroundOpaque(TRUE); - // Position floater based on saved location - LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect2"); - reshape(saved_position_rect.getWidth(), saved_position_rect.getHeight(), FALSE); - setRect(saved_position_rect); - mWebBrowser = getChild<LLWebBrowserCtrl>("floater_hud_browser" ); if (mWebBrowser) { @@ -91,9 +86,6 @@ LLFloaterHUD::LLFloaterHUD() std::string url = base_url + language + "/"; mWebBrowser->navigateTo(url); } - - // Remember the one instance - sInstance = this; } // Get the instance @@ -101,7 +93,7 @@ LLFloaterHUD* LLFloaterHUD::getInstance() { if (!sInstance) { - new LLFloaterHUD(); + sInstance = new LLFloaterHUD(); } return sInstance; } @@ -109,9 +101,6 @@ LLFloaterHUD* LLFloaterHUD::getInstance() // Destructor LLFloaterHUD::~LLFloaterHUD() { - // Save floater position - gSavedSettings.setRect("FloaterHUDRect2", getRect() ); - // Clear out the one instance if it's ours if (sInstance == this) { @@ -131,7 +120,7 @@ void LLFloaterHUD::showHUD() // Create the instance if necessary LLFloaterHUD* hud = getInstance(); - hud->open(); + hud->openFloater(); hud->setFrontmost(FALSE); } |