aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llstartup.cpp10
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()
1670 gLoginMenuBarView->setVisible( FALSE ); 1670 gLoginMenuBarView->setVisible( FALSE );
1671 gLoginMenuBarView->setEnabled( FALSE ); 1671 gLoginMenuBarView->setEnabled( FALSE );
1672 1672
1673 gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
1674
1675 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0); 1673 LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
1676 gViewerWindow->adjustControlRectanglesForFirstUse(window); 1674 gViewerWindow->adjustControlRectanglesForFirstUse(window);
1677 1675
1676 if(gSavedSettings.getBOOL("ShowMiniMap"))
1677 {
1678 LLFloaterMap::showInstance();
1679 }
1680
1678 if (gSavedSettings.getBOOL("ShowCameraControls")) 1681 if (gSavedSettings.getBOOL("ShowCameraControls"))
1679 { 1682 {
1680 LLFloaterCamera::showInstance(); 1683 LLFloaterCamera::showInstance();
@@ -3911,8 +3914,7 @@ void reset_login()
3911 } 3914 }
3912 3915
3913 // Hide any other stuff 3916 // Hide any other stuff
3914 if ( gFloaterMap ) 3917 LLFloaterMap::hideInstance();
3915 gFloaterMap->setVisible( FALSE );
3916} 3918}
3917 3919
3918//--------------------------------------------------------------------------- 3920//---------------------------------------------------------------------------