summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-08 15:10:27 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-03-08 15:10:27 -0800
commit8bd5a3bca38b0ba663d3563029e54da057020424 (patch)
treed7210ffa432a0d37ef8cb9b9bda91d6c41248172 /indra/newview/llappviewer.cpp
parent836ab95d90298092dd845f47b5ac51817d7bb665 (diff)
DEV-45976 Last Login Location Preference not remembered
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9535e5f239..9fd486b2ff 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2098,12 +2098,8 @@ bool LLAppViewer::initConfiguration()
}
else if(clp.hasOption("slurl"))
{
- LLStartUp::setStartSLURL(LLSLURL(clp.getOption("surl")[0]));
- if(LLStartUp::getStartSLURL().getType() == LLSLURL::LOCATION)
- {
- LLGridManager::getInstance()->setGridChoice(LLStartUp::getStartSLURL().getGrid());
-
- }
+ LLSLURL start_slurl(clp.getOption("slurl")[0]);
+ LLStartUp::setStartSLURL(start_slurl);
}
const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");