diff options
| author | Richard Linden <none@none> | 2011-07-07 12:11:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-07 12:11:30 -0700 |
| commit | 674d8522a10d0067a8b4067aca9853cbce68e3c9 (patch) | |
| tree | 71c47b93454df37c05d99c87e288a11c6bab99c3 | |
| parent | 77e99e0887b8b1f60ccfe1aeb1cf31c56517f81d (diff) | |
EXP-847 FIX As a user, I would like to see the How To floater appear the first time I log in to basic mode
made help window not appear on login for advanced mode
made help window visibility state properly persist in advanced mode
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerhelp.cpp | 13 |
2 files changed, 2 insertions, 13 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 |