diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-05 13:55:09 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-05 13:55:09 -0800 |
| commit | 7a6494df680be129eb14fb45e996804a190e86fa (patch) | |
| tree | 99a6f245722e8f0563c5459fa5b84566609f5cf5 /indra/newview/llpanellogin.cpp | |
| parent | e90fbe5b270d8083e9a8e12dacf3e016131938cf (diff) | |
| parent | 9204681c31184c4c76c8f41c48da76e174e3276a (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) |