summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llstartup.cpp2
-rw-r--r--indra/newview/llviewerwindow.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index dda155d0df..a6a9447e39 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1548,6 +1548,8 @@ BOOL idle_startup()
}
gLoginMenuBarView->setVisible( FALSE );
+ gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
+
if (!gNoRender)
{
// Move the progress view in front of the UI
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index bc41a88e27..4baafbcfa4 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1905,7 +1905,6 @@ void LLViewerWindow::initWorldUI()
// TODO: Move instance management into class
gFloaterMap = new LLFloaterMap("Map");
gFloaterMap->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
- gFloaterMap->setVisible( gSavedSettings.getBOOL("ShowMiniMap") );
// keep onscreen
gFloaterView->adjustToFitScreen(gFloaterMap, FALSE);