merge

--HG--
branch : product-engine

1 files changed, 33 insertions, 1 deletions

diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 4fa97e789b..48fc60d529 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -44,6 +44,7 @@
 #include "llfontgl.h"
 #include "llsdserialize.h"
 #include "lltooltip.h"
+#include "llbutton.h"
 
 #include "llappviewer.h"
 #include "llviewertexturelist.h"
@@ -99,6 +100,8 @@ LLFastTimerView::LLFastTimerView(const LLRect& rect)
 	FTV_NUM_TIMERS = LLFastTimer::NamedTimer::instanceCount();
 	mPrintStats = -1;	
 	mAverageCyclesPerTimer = 0;
+	setCanMinimize(false);
+	setCanClose(true);
 }
 
 
@@ -139,6 +142,18 @@ LLFastTimer::NamedTimer* LLFastTimerView::getLegendID(S32 y)
 
 BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+
+	{
+		S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft;
+		S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom;
+		if(mButtons[BUTTON_CLOSE]->getVisible()
+			&&  mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y)  )
+		{
+			return LLFloater::handleMouseDown(x, y, mask);;
+		}
+	}
+	
+
 	if (x < mBarRect.mLeft) 
 	{
 		LLFastTimer::NamedTimer* idp = getLegendID(y);
@@ -188,11 +203,25 @@ BOOL LLFastTimerView::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLFastTimerView::handleMouseUp(S32 x, S32 y, MASK mask)
 {
+	{
+		S32 local_x = x - mButtons[BUTTON_CLOSE]->getRect().mLeft;
+		S32 local_y = y - mButtons[BUTTON_CLOSE]->getRect().mBottom;
+		if(mButtons[BUTTON_CLOSE]->getVisible()
+			&&  mButtons[BUTTON_CLOSE]->pointInView(local_x, local_y)  )
+		{
+			return LLFloater::handleMouseUp(x, y, mask);;
+		}
+	}
 	return FALSE;
 }
 
 BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
 {
+	/*if(y>getRect().getHeight()-20)
+	{
+		return LLFloater::handleMouseDown(x, y, mask);
+	}*/
+
 	mHoverTimer = NULL;
 	mHoverID = NULL;
 
@@ -1191,5 +1220,8 @@ void LLFastTimerView::doAnalysis(std::string baseline, std::string target, std::
 		return ;
 	}
 }
-
+void	LLFastTimerView::onClickCloseBtn()
+{
+	setVisible(false);
+}