diff options
| author | richard <none@none> | 2009-12-17 10:03:56 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 10:03:56 -0800 |
| commit | 724f5fbb7f7b101774c0cf3ff43bb98f9cc4ffc1 (patch) | |
| tree | bfb7b4009b32761f9f760f97dd97cc0697667a71 /indra/newview/llpanellogin.cpp | |
| parent | 9ff869a6b287a2b4b8c94219584d1c7b66ebb399 (diff) | |
| parent | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 48adfd0011..1d89c3bde0 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -62,7 +62,6 @@ #include "llviewermenu.h" // for handle_preferences() #include "llviewernetwork.h" #include "llviewerwindow.h" // to link into child list -#include "llnotify.h" #include "llurlsimstring.h" #include "lluictrlfactory.h" #include "llhttpclient.h" @@ -677,12 +676,8 @@ 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 } |