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

made destination guide url configurable on command line

meow-7.2.2
Richard Linden 2010-10-13 18:41:35 -07:00
parent 0732b48be9
commit 73b39c9b46
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2523,7 +2523,18 @@
<key>Value</key>
<integer>10</integer>
</map>
<key>DisableCameraConstraints</key>
<key>DestinationGuideURL</key>
<map>
<key>Comment</key>
<string>Destination guide contents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://www.secondlife.com</string>
</map>
<key>DisableCameraConstraints</key>
<map>
<key>Comment</key>
<string>Disable the normal bounds put on the camera by avatar position</string>

5
indra/newview/llcommandlineparser.cpp
View File

@ -341,7 +341,10 @@ bool LLCommandLineParser::parseCommandLine(int argc, char **argv)
bool LLCommandLineParser::parseCommandLineString(const std::string& str)
{
// Split the string content into tokens
boost::escaped_list_separator<char> sep("\\", "\r\n ", "\"'");
const char* escape_chars = "\\";
const char* separator_chars = "\r\n ";
const char* quote_chars = "\"'";
boost::escaped_list_separator<char> sep(escape_chars, separator_chars, quote_chars);
boost::tokenizer< boost::escaped_list_separator<char> > tok(str, sep);
std::vector<std::string> tokens;
// std::copy(tok.begin(), tok.end(), std::back_inserter(tokens));

7
indra/newview/llviewerwindow.cpp
View File

@ -1698,6 +1698,13 @@ void LLViewerWindow::initWorldUI()
buttons_panel->setShape(buttons_panel_container->getLocalRect());
buttons_panel->setFollowsAll();
buttons_panel_container->addChild(buttons_panel);
LLView* destination_guide = gViewerWindow->getRootView()->getChild<LLView>("destination_guide_container");
LLMediaCtrl* destinations = destination_guide->findChild<LLMediaCtrl>("destination_guide_contents");
if (destinations)
{
destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"));
}
}
// Destroy the UI