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

CHOP-959: Merge About-box changes with tip

master
Nat Goodspeed 2013-07-11 19:45:25 -04:00
parent 879dfd161e e856f9bcfc
commit 1bb1fe511f
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/app_settings/cmd_line.xml
View File

@ -22,7 +22,8 @@
<map>
<key>count</key>
<integer>1</integer>
<!-- Special case. Not mapped to a setting. -->
<key>map-to</key>
<string>CmdLineChannel</string>
</map>
<key>console</key>
@ -372,7 +373,8 @@
<boolean>true</boolean>
<key>last_option</key>
<boolean>true</boolean>
<!-- Special case. Not mapped to a setting. -->
<key>map-to</key>
<string>CmdLineLoginLocation</string>
</map>
<key>url</key>
@ -383,7 +385,8 @@
<integer>1</integer>
<key>last_option</key>
<boolean>true</boolean>
<!-- Special case. Not mapped to a setting. -->
<key>map-to</key>
<string>CmdLineLoginLocation</string>
</map>
<key>usersessionsettings</key>

22
indra/newview/app_settings/settings.xml
View File

@ -1749,6 +1749,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>CmdLineChannel</key>
<map>
<key>Comment</key>
<string>Command line specified channel name</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string />
</map>
<key>CmdLineDisableVoice</key>
<map>
<key>Comment</key>
@ -1795,6 +1806,17 @@
<string />
</array>
</map>
<key>CmdLineLoginLocation</key>
<map>
<key>Comment</key>
<string>Startup destination requested on command line</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string/>
</map>
<key>ConnectAsGod</key>
<map>
<key>Comment</key>

34
indra/newview/llappviewer.cpp
View File

@ -2536,9 +2536,10 @@ bool LLAppViewer::initConfiguration()
}
}
if(clp.hasOption("channel"))
{
LLVersionInfo::resetChannel(clp.getOption("channel")[0]);
std::string CmdLineChannel(gSavedSettings.getString("CmdLineChannel"));
if(! CmdLineChannel.empty())
{
LLVersionInfo::resetChannel(CmdLineChannel);
}
// If we have specified crash on startup, set the global so we'll trigger the crash at the right time
@ -2597,20 +2598,16 @@ bool LLAppViewer::initConfiguration()
// What can happen is that someone can use IE (or potentially
// other browsers) and do the rough equivalent of command
// injection and steal passwords. Phoenix. SL-55321
if(clp.hasOption("url"))
{
LLStartUp::setStartSLURL(LLSLURL(clp.getOption("url")[0]));
if(LLStartUp::getStartSLURL().getType() == LLSLURL::LOCATION)
{
LLGridManager::getInstance()->setGridChoice(LLStartUp::getStartSLURL().getGrid());
}
}
else if(clp.hasOption("slurl"))
{
LLSLURL start_slurl(clp.getOption("slurl")[0]);
std::string CmdLineLoginLocation(gSavedSettings.getString("CmdLineLoginLocation"));
if(! CmdLineLoginLocation.empty())
{
LLSLURL start_slurl(CmdLineLoginLocation);
LLStartUp::setStartSLURL(start_slurl);
}
if(start_slurl.getType() == LLSLURL::LOCATION)
{
LLGridManager::getInstance()->setGridChoice(start_slurl.getGrid());
}
}
const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");
if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
@ -2753,9 +2750,8 @@ bool LLAppViewer::initConfiguration()
LL_DEBUGS("AppInit")<<"set start from NextLoginLocation: "<<nextLoginLocation<<LL_ENDL;
LLStartUp::setStartSLURL(LLSLURL(nextLoginLocation));
}
else if ( ( clp.hasOption("login") || clp.hasOption("autologin"))
&& !clp.hasOption("url")
&& !clp.hasOption("slurl"))
else if ((clp.hasOption("login") || clp.hasOption("autologin"))
&& gSavedSettings.getString("CmdLineLoginLocation").empty())
{
// If automatic login from command line with --login switch
// init StartSLURL location.