diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llsyswellwindow.h | 9 | 
2 files changed, 7 insertions, 18 deletions
| diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index bcaefc3690..26d8338b24 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -52,7 +52,7 @@  #include "llspeakers.h"  //--------------------------------------------------------------------------------- -LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLDockableFloater(NULL, key), +LLSysWellWindow::LLSysWellWindow(const LLSD& key) : LLTransientDockableFloater(NULL, true,  key),  													mChannel(NULL),  													mMessageList(NULL),  													mSysWellChiclet(NULL), @@ -90,13 +90,13 @@ BOOL LLSysWellWindow::postBuild()  	// mouse up callback is not called in this case.  	setMouseDownCallback(boost::bind(&LLSysWellWindow::releaseNewMessagesState, this)); -	return LLDockableFloater::postBuild(); +	return LLTransientDockableFloater::postBuild();  }  //---------------------------------------------------------------------------------  void LLSysWellWindow::setMinimized(BOOL minimize)  { -	LLDockableFloater::setMinimized(minimize); +	LLTransientDockableFloater::setMinimized(minimize);  }  //--------------------------------------------------------------------------------- @@ -176,7 +176,7 @@ void LLSysWellWindow::setVisible(BOOL visible)  	// do not show empty window  	if (NULL == mMessageList || isWindowEmpty()) visible = FALSE; -	LLDockableFloater::setVisible(visible); +	LLTransientDockableFloater::setVisible(visible);  	// update notification channel state	  	if(mChannel) @@ -192,15 +192,9 @@ 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); +	LLTransientDockableFloater::setDocked(docked, pop_on_undock);  	// update notification channel state  	if(mChannel) diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h index 7030f4b427..d21d095d1a 100644 --- a/indra/newview/llsyswellwindow.h +++ b/indra/newview/llsyswellwindow.h @@ -35,7 +35,7 @@  #include "llsyswellitem.h" -#include "lldockablefloater.h" +#include "lltransientdockablefloater.h"  #include "llbutton.h"  #include "llscreenchannel.h"  #include "llscrollcontainer.h" @@ -50,7 +50,7 @@ class LLScriptChiclet;  class LLSysWellChiclet; -class LLSysWellWindow : public LLDockableFloater +class LLSysWellWindow : public LLTransientDockableFloater  {  public:      LLSysWellWindow(const LLSD& key); @@ -72,11 +72,6 @@ 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);  	void setSysWellChiclet(LLSysWellChiclet* chiclet) { mSysWellChiclet = chiclet; } | 
