DRTVWR-453: Merge up to latest viewer-release.

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
index 9edfe1e354..c43526acaf 100644
--- a/indra/newview/llfloatermemleak.cpp
+++ b/indra/newview/llfloatermemleak.cpp
@@ -42,6 +42,8 @@ U32 LLFloaterMemLeak::sTotalLeaked = 0 ;
 S32 LLFloaterMemLeak::sStatus = LLFloaterMemLeak::STOP ;
 BOOL LLFloaterMemLeak::sbAllocationFailed = FALSE ;
 
+extern BOOL gSimulateMemLeak;
+
 LLFloaterMemLeak::LLFloaterMemLeak(const LLSD& key)
 	: LLFloater(key)
 {
@@ -104,6 +106,7 @@ void LLFloaterMemLeak::release()
 	sStatus = STOP ;
 	sTotalLeaked = 0 ;
 	sbAllocationFailed = FALSE ;
+	gSimulateMemLeak = FALSE;
 }
 
 void LLFloaterMemLeak::stop()
@@ -140,8 +143,7 @@ void LLFloaterMemLeak::idle()
 	}
 	if(!p)
 	{
-		sStatus = STOP ;
-		sbAllocationFailed = TRUE ;
+		stop();
 	}
 }
 
@@ -181,6 +183,7 @@ void LLFloaterMemLeak::onChangeMaxMemLeaking()
 void LLFloaterMemLeak::onClickStart()
 {
 	sStatus = START ;
+	gSimulateMemLeak = TRUE;
 }
 
 void LLFloaterMemLeak::onClickStop()