diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-02-01 15:13:19 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-01 15:13:19 -0800 |
commit | 83356a779be51f3108a95ed4b680b5fe04800f25 (patch) | |
tree | 9a443ed2c263b5b98995e5ec9a2e6f29143eb1a9 /indra/newview/llpanellogin.cpp | |
parent | 0f8cdbe72a7b76bc1ca26b4573ab360ea4b12376 (diff) | |
parent | f44ee460c5d2c3531ea213b22e112bc74fe471d0 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 87d101b00f..af9e791223 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -689,6 +689,23 @@ void LLPanelLogin::refreshLocation( bool force_visible ) } // static +void LLPanelLogin::updateLocationUI() +{ + if (!sInstance) return; + + std::string sim_string = LLURLSimString::sInstance.mSimString; + if (!sim_string.empty()) + { + // Replace "<Type region name>" with this region name + LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo"); + combo->remove(2); + combo->add( sim_string ); + combo->setTextEntry(sim_string); + combo->setCurrentByIndex( 2 ); + } +} + +// static void LLPanelLogin::closePanel() { if (sInstance) |