summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2008-01-19 01:07:57 +0000
committerLeyla Farazha <leyla@lindenlab.com>2008-01-19 01:07:57 +0000
commitaa10b000278affd5fa4714e73b6fe21fdaa4ea65 (patch)
tree26fcb1f0044da93dc349e380f956d7835b418cf6
parent8787690ccc7edf88033c923d6b36f2142ea35ada (diff)
dev-8998 xuilogin shows grid dropdown by default
-rw-r--r--indra/newview/llpanellogin.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 639220bce7..1167a23217 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -402,9 +402,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
combo->setCommitCallback( &LLPanelGeneral::set_start_location );
}
- // Specific servers added later.
- childSetVisible("server_combo", show_server);
-
childSetAction("new_account_btn", onClickNewAccount, this);
childSetVisible("new_account_btn", !gHideLinks);
@@ -879,8 +876,12 @@ void LLPanelLogin::refreshLocation( bool force_visible )
sInstance->childSetVisible("start_location_combo", show_start);
sInstance->childSetVisible("start_location_text", show_start);
- BOOL show_server = ! gSavedSettings.getBOOL("ForceShowGrid");
+#if LL_RELEASE_FOR_DOWNLOAD
+ BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
sInstance->childSetVisible("server_combo", show_server);
+#else
+ sInstance->childSetVisible("server_combo", TRUE);
+#endif
#endif
}