From 674d8522a10d0067a8b4067aca9853cbce68e3c9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 7 Jul 2011 12:11:30 -0700 Subject: 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 --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llviewerhelp.cpp | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'indra') 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 @@ Type Boolean Value - 1 + 0 ShowHelpOnFirstLogin 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(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 -- cgit v1.2.3 From 5302a9c67a77c455132648e6b61f7f309956613e Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 7 Jul 2011 12:26:00 -0700 Subject: 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 turned off save_rect for basic mode help window so it isn't influenced by resizing window in advanced mode --- indra/newview/skins/minimal/xui/en/floater_help_browser.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'indra') 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"> -- cgit v1.2.3