livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix command line loginuri on opensim version

Cinders 2013-11-07 23:49:33 -07:00
parent 3359f52d68
commit 0eaeb2fe34
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/fsgridhandler.cpp
View File

@ -308,39 +308,13 @@ void LLGridManager::initCmdLineGrids()
// load a grid from the command line.
// if the actual grid name is specified from the command line,
// set it as the 'selected' grid.
// <FS:AW fix commandline loginuri (partial fix of FIRE-3448)>
// LLSD cmd_line_login_uri = gSavedSettings.getLLSD("CmdLineLoginURI");
// if (cmd_line_login_uri.isString() && !cmd_line_login_uri.asString().empty())
// {
// mGrid = cmd_line_login_uri.asString();
// gSavedSettings.setLLSD("CmdLineLoginURI", LLSD::emptyArray()); //in case setGridChoice tries to addGrid
// //and addGrid recurses here.
// NOTE: This isn't fixed in llviewernetwork because it seems upstream
// is going to remove the commandline loginuri soon anyway.
std::string grid;
std::string cmd_line_login_uri = gSavedSettings.getString("CmdLineLoginURI1");
if (!cmd_line_login_uri.empty())
{
grid = cmd_line_login_uri;
// clear in case setGridChoice tries to addGrid and addGrid recurses here;
// however this only happens refetching all grid infos.
gSavedSettings.setString("CmdLineLoginURI1",std::string());
LL_DEBUGS("GridManager") << "Setting grid from --loginuri " << grid << LL_ENDL;
//</FS:AW fix commandline loginuri (partial fix of FIRE-3448)-->
setGridChoice(grid);
return;
}
std::string cmd_line_grid = gSavedSettings.getString("CmdLineGridChoice");
if(!cmd_line_grid.empty())
{
// try to find the grid assuming the command line parameter is
// the case-insensitive 'label' of the grid. ie 'Agni'
gSavedSettings.setString("CmdLineGridChoice",std::string());
grid = getGridByGridNick(cmd_line_grid);
if(grid.empty())

10
indra/newview/fsgridhandler.h
View File

@ -42,18 +42,18 @@ const std::string ADITI = "Second Life Beta";
const std::string MAINGRID = "util.agni.lindenlab.com";
const std::string GRID_VALUE = "name";
const std::string GRID_LABEL_VALUE = "gridname";
const std::string GRID_ID_VALUE = "grid_login_id";
const std::string GRID_LOGIN_URI_VALUE = "loginuri";
const std::string GRID_UPDATE_SERVICE_URL = "update_query_url_base";
const std::string GRID_HELPER_URI_VALUE = "helperuri";
const std::string GRID_LOGIN_PAGE_VALUE = "loginpage";
const std::string GRID_IS_SYSTEM_GRID_VALUE = "system_grid";
const std::string GRID_IS_FAVORITE_VALUE = "favorite";
const std::string GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types";
const std::string GRID_UPDATE_SERVICE_URL = "update_query_url_base";
// <Opensim/Aurora consts>
const std::string GRID_LABEL_VALUE = "gridname";
const std::string GRID_NICK_VALUE = "gridnick";
const std::string GRID_LOGIN_URI_VALUE = "loginuri";
const std::string GRID_HELPER_URI_VALUE = "helperuri";
const std::string GRID_LOGIN_PAGE_VALUE = "loginpage";
const std::string GRID_REGISTER_NEW_ACCOUNT = "register";
const std::string GRID_FORGOT_PASSWORD = "password";
const std::string GRID_HELP = "help";