diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
| commit | f07b332ef0aafd1ecb82b6077309a5292c9cddc1 (patch) | |
| tree | a76fabd4f71bdbb86b7fe6efb9a6acc0529a429c /indra/newview/llpanellogin.cpp | |
| parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge branch 'master' into DV525-merge-6.4.13
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index a19182b01e..4f60703488 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1337,8 +1337,10 @@ void LLPanelLogin::onSelectServer() switch (index) { case 0: // last location + LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_LAST)); + break; case 1: // home location - // do nothing - these are grid-agnostic locations + LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME)); break; default: |