merge

--HG--
branch : product-engine

2 files changed, 13 insertions, 6 deletions

diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index e5a4b456a0..f64cd4727b 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -45,10 +45,6 @@
 #include "lltoastpanel.h"
 #include "llnotificationmanager.h"
 
-
-static std::string NOTIFICATION_WELL_ANCHOR_NAME = "notification_well_panel";
-static std::string IM_WELL_ANCHOR_NAME = "im_well_panel";
-
 //---------------------------------------------------------------------------------
 LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLDockableFloater(NULL, key),
 													mChannel(NULL),
@@ -175,6 +171,12 @@ void LLSysWellWindow::setVisible(BOOL visible)
 }
 
 //---------------------------------------------------------------------------------
+void LLSysWellWindow::onFocusLost()
+{
+	setVisible(false);
+}
+
+//---------------------------------------------------------------------------------
 void LLSysWellWindow::setDocked(bool docked, bool pop_on_undock)
 {
 	LLDockableFloater::setDocked(docked, pop_on_undock);
diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index d2c494bfe8..adbc83677d 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -47,8 +47,6 @@ class LLFlatListView;
 class LLChiclet;
 class LLIMChiclet;
 
-extern std::string NOTIFICATION_WELL_ANCHOR_NAME;
-extern std::string IM_WELL_ANCHOR_NAME;
 
 
 class LLSysWellWindow : public LLDockableFloater
@@ -73,6 +71,11 @@ public:
 	// override LLFloater's minimization according to EXT-1216
 	/*virtual*/ void	setMinimized(BOOL minimize);
 
+	/** 
+	 * Hides window when user clicks away from it (EXT-3084)
+	 */
+	/*virtual*/ void onFocusLost();
+
 	void onStartUpToastClick(S32 x, S32 y, MASK mask);
 
 	// size constants for the window and for its elements
@@ -96,6 +99,8 @@ protected:
 	void handleItemRemoved(EItemType removed_item_type);
 	bool anotherTypeExists(EItemType item_type) ;
 
+	const std::string NOTIFICATION_WELL_ANCHOR_NAME;
+	const std::string IM_WELL_ANCHOR_NAME;
 	virtual const std::string& getAnchorViewName() = 0;
 
 	void reshapeWindow();