Remove preprocessor condition for grid selector.

The grid selector on the login screen will always show,
instead of only showing when the viewer was compiled
as LL_RELEASE_FOR_DOWNLOAD.

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7324410..88829c9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,12 @@
 2008-11-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llpanellogin.cpp:
+        Remove preprocessor condition for grid selector.
+        The grid selector on the login screen will always show,
+        instead of only showing when the viewer was compiled
+        as LL_RELEASE_FOR_DOWNLOAD.
+
+
         * linden/indra/newview/llappviewer.cpp:
         Stop console window from always showing up.
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 1dff8e7..09e2cee 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -789,12 +789,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
-#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
 }