merge viewer/viewer_1-21 94170-94770 -> release

merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme

1 files changed, 8 insertions, 13 deletions

diff --git a/indra/newview/llfloaterhud.h b/indra/newview/llfloaterhud.h
index b51b05d3b8..9cbf239c18 100644
--- a/indra/newview/llfloaterhud.h
+++ b/indra/newview/llfloaterhud.h
@@ -1,6 +1,6 @@
 /** 
  * @file llfloaterhud.h
- * @brief The HUD floater
+ * @brief A floater showing the HUD tutorial
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
  * Copyright (c) 2008, Linden Research, Inc.
@@ -14,28 +14,23 @@
 
 class LLWebBrowserCtrl;
 
-//=============================================================================
-//
-//	CLASS		LLFloaterHUD
-
 class LLFloaterHUD : public LLFloater
-
-/*!	@brief		A floater showing the HUD tutorial
-*/
 {
 public:
 	static LLFloaterHUD* getInstance(); ///< get instance creating if necessary
-	virtual ~LLFloaterHUD(); ///< virtual destructor
 
 	static void showHUD(); ///< show the HUD
-	static void closeHUD(); ///< close the HUD (destroys floater)
 
-protected:
-	LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
+	// Save our visibility state during close
+	/*virtual*/ void onClose(bool app_quitting);
 
-	LLFloaterHUD(); ///< default constructor
+private:
+	// Handles its own construction and destruction, so private.
+	LLFloaterHUD();
+	/*virtual*/ ~LLFloaterHUD();
 
 private:
+	LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
 	static LLFloaterHUD* sInstance;
 };