Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

Browse Source
This commit is contained in:
Shyotl
2013-05-31 05:33:41 -05:00
parent 641ada030e
commit ef3e918558
148 changed files with 15636 additions and 4633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llloginhandler.cpp
View File

@@ -36,8 +36,8 @@
// viewer includes
#include "llpanellogin.h" // save_password_to_disk()
#include "llslurl.h"
#include "llstartup.h" // getStartupState()
#include "llurlsimstring.h"
#include "llviewercontrol.h" // gSavedSettings
#include "llviewernetwork.h" // EGridInfo
@@ -79,17 +79,15 @@ void LLLoginHandler::parse(const LLSD& queryMap)
if (startLocation == "specify")
{
LLURLSimString::setString(queryMap["region"].asString());
LLStartUp::setStartSLURL(queryMap["region"].asString());
}
else if (startLocation == "home")
{
gSavedSettings.setBOOL("LoginLastLocation", FALSE);
LLURLSimString::setString(LLStringUtil::null);
LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME));
}
else if (startLocation == "last")
{
gSavedSettings.setBOOL("LoginLastLocation", TRUE);
LLURLSimString::setString(LLStringUtil::null);
LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_LAST));
}
}