merge changes for storm-1489

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp
index 627defd006..3012638d44 100644
--- a/indra/newview/llfloaterhelpbrowser.cpp
+++ b/indra/newview/llfloaterhelpbrowser.cpp
@@ -71,9 +71,18 @@ void LLFloaterHelpBrowser::buildURLHistory()
 	}
 }
 
+void LLFloaterHelpBrowser::onOpen(const LLSD& key)
+{
+	gSavedSettings.setBOOL("HelpFloaterOpen", TRUE);
+}
+
 //virtual
 void LLFloaterHelpBrowser::onClose(bool app_quitting)
 {
+	if (!app_quitting)
+	{
+		gSavedSettings.setBOOL("HelpFloaterOpen", FALSE);
+	}
 	// really really destroy the help browser when it's closed, it'll be recreated.
 	destroy(); // really destroy this dialog on closure, it's relatively heavyweight.
 }