diff options
| author | Richard Linden <none@none> | 2011-07-07 12:26:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-07 12:26:09 -0700 |
| commit | 1f98fc8f6e07230a52e8ab2247e9ccf003efa6bb (patch) | |
| tree | a43bffc9cc3c12c51a8cb54788f99200fae2d04b /indra | |
| parent | 791da71c3ea45130cd3817a059a18418e43269b0 (diff) | |
| parent | 5302a9c67a77c455132648e6b61f7f309956613e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerhelp.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/floater_help_browser.xml | 1 |
3 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1751f6702a..ad9b6b0c90 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13430,7 +13430,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>ShowHelpOnFirstLogin</key> <map> diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp index 69522b7ab3..3a3d4f3881 100644 --- a/indra/newview/llviewerhelp.cpp +++ b/indra/newview/llviewerhelp.cpp @@ -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 diff --git a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml index 6eb40bc943..477f210352 100644 --- a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml @@ -10,7 +10,6 @@ top="10" min_width="335" name="floater_help_browser" - save_rect="true" single_instance="true" title="HOW TO" width="335"> |