Backported 1.23's minimap conversion to XUI

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index df7c084..aca3cac 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1670,11 +1670,14 @@ bool idle_startup()
                 gLoginMenuBarView->setVisible( FALSE );
                 gLoginMenuBarView->setEnabled( FALSE );
 
-                gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
-
                 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
                 gViewerWindow->adjustControlRectanglesForFirstUse(window);
 
+                if(gSavedSettings.getBOOL("ShowMiniMap"))
+                {
+                        LLFloaterMap::showInstance();
+                }
+
                 if (gSavedSettings.getBOOL("ShowCameraControls"))
                 {
                         LLFloaterCamera::showInstance();
@@ -3911,8 +3914,7 @@ void reset_login()
         }
 
         // Hide any other stuff
-        if ( gFloaterMap )
-                gFloaterMap->setVisible( FALSE );
+        LLFloaterMap::hideInstance();
 }
 
 //---------------------------------------------------------------------------