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

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience

meow-7.2.2
Richard Linden 2011-07-07 12:26:09 -07:00
parent 791da71c3e 5302a9c67a
commit 1f98fc8f6e
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13430,7 +13430,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>ShowHelpOnFirstLogin</key>
<map>

13
indra/newview/llviewerhelp.cpp
View File

@ -149,18 +149,7 @@ std::string LLViewerHelp::getTopicFromFocus()
// static
void LLViewerHelp::showHelp()
{
LLFloaterHelpBrowser* helpbrowser = dynamic_cast<LLFloaterHelpBrowser*>(LLFloaterReg::getInstance("help_browser"));
if (helpbrowser)
{
BOOL visible = TRUE;
BOOL take_focus = TRUE;
helpbrowser->setVisible(visible);
helpbrowser->setFrontmost(take_focus);
}
else
{
llwarns << "Eep, help_browser floater not found" << llendl;
}
LLFloaterReg::showInstance("help_browser");
}
// static

1
indra/newview/skins/minimal/xui/en/floater_help_browser.xml
View File

@ -10,7 +10,6 @@
top="10"
min_width="335"
name="floater_help_browser"
save_rect="true"
single_instance="true"
title="HOW TO"
width="335">