diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-05 14:31:09 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-01-05 14:31:09 +0200 |
| commit | 47dc1fc3437c9c266204604e85d8489b6e580584 (patch) | |
| tree | df6b5e926ecda5205a5e6151e8149d261de1a744 /indra/newview/llpanellogin.cpp | |
| parent | eb880b2a559fe1103bef47fa3f6c7611a6c3cfbb (diff) | |
| parent | 5043fcce370fd21e9709f94787191a060919cc2b (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index a9c7b908ed..87d101b00f 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 "llurlsimstring.h" #include "lluictrlfactory.h" #include "llhttpclient.h" #include "llweb.h" @@ -229,8 +228,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, LLComboBox* combo = getChild<LLComboBox>("start_location_combo"); - LLURLSimString::setString(gSavedSettings.getString("LoginLocation")); std::string sim_string = LLURLSimString::sInstance.mSimString; + if(sim_string.empty()) + { + LLURLSimString::setString(gSavedSettings.getString("LoginLocation")); + } + if (!sim_string.empty()) { // Replace "<Type region name>" with this region name |