diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:59:02 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:59:02 -0800 |
| commit | 23760a63a0f018a48625710f8de07e490f3cdd2f (patch) | |
| tree | 837a785cd88e96212c3466095d39f18c02ed4ec9 /indra/newview/llpanellogin.cpp | |
| parent | 1f8ad2651d82b81fc85d91f3d48663430427537e (diff) | |
| parent | aba3d46fb47a4dab652254ed099037629a87dc24 (diff) | |
merge
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 a9c604b72a..771e34e6cc 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -687,6 +687,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) |