diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
| commit | e5c9fe005e2533b10ad9eeeec9041171f15247d0 (patch) | |
| tree | 43cfc17cf53709ed887506b655093f856126ae96 /indra/newview/llpanellogin.cpp | |
| parent | 3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (diff) | |
| parent | 17d1d3c129c25dd27ddbf2d15ab8873a61c16658 (diff) | |
Automated merge with http://demeter:8000
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 48adfd0011..ee5f2c6cfd 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -677,12 +677,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 } |