diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-18 14:25:15 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-18 14:25:15 -0800 |
| commit | 4d55b5bad0cfabc4c9bb4e4d7234efc77b3547e8 (patch) | |
| tree | 9bfa670a6cd4b40f20d5ae710f028872d592c0ba /indra/newview/llpanellogin.cpp | |
| parent | 0e729489438898d0de062ea5d744be3009e47c57 (diff) | |
| parent | 064c9be9aedf238530ccdc941861fd057580e5b1 (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 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index a9c7b908ed..cdfa64ba57 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -686,6 +686,21 @@ void LLPanelLogin::refreshLocation( bool force_visible ) } // static +void LLPanelLogin::updateLocationUI() +{ + 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) |