diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-19 13:05:28 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-19 13:05:28 -0700 |
| commit | b55bce5b1b74c612f3a411889df1e0fb57bc3264 (patch) | |
| tree | 742c717acf3ff015b1c799125054620f7ee11754 | |
| parent | 8ba5517a0827af423e95526043c6cf52b211e73f (diff) | |
| parent | 6b6e0b7e58db469026db133c987add38bf41b644 (diff) | |
automated merge
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 42e4b397db..a9e6484061 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -785,11 +785,20 @@ void LLPanelLogin::getLocation(LLSLURL& slurl) switch(combo->getCurrentIndex()) { case 0: + { slurl = LLSLURL(LLSLURL::SIM_LOCATION_HOME); + break; + } case 1: + { slurl = LLSLURL(LLSLURL::SIM_LOCATION_LAST); + break; + } default: + { slurl = LLSLURL(combo->getValue().asString()); + break; + } } } |