diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-16 22:59:55 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-16 22:59:55 +0200 |
| commit | e8818a3677f8af440456abec77cf31e7621fb9fa (patch) | |
| tree | bc133fdc31e8600eaf3d1ac4a707928c32cf1d57 /indra/newview/llfloatermemleak.cpp | |
| parent | fadb3792caa5279d3521dcaad44a6211bfa4bfad (diff) | |
MAINT-8154 Disabled exception handling in LLAppViewer::frame() to get proper call stacks
Diffstat (limited to 'indra/newview/llfloatermemleak.cpp')
| -rw-r--r-- | indra/newview/llfloatermemleak.cpp | 7 |
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() |