summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-01-26 17:03:30 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-01-26 17:03:30 -0700
commit6531eed04e24239233f79624572219e88017f476 (patch)
treeb1ba1d38648046f2d2a42ae03ad84bdd55518b11 /indra/newview
parent8f54dc2958e75587165623b0292940200fb49f59 (diff)
add "pause" function for SH-846: design and implement the debug code to locate memory leaking
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmemoryview.cpp4
-rw-r--r--indra/newview/llmemoryview.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp
index 397a77c4e3..7e9c3c84a7 100644
--- a/indra/newview/llmemoryview.cpp
+++ b/indra/newview/llmemoryview.cpp
@@ -41,6 +41,7 @@
LLMemoryView::LLMemoryView(const LLMemoryView::Params& p)
: LLView(p),
+ mPaused(FALSE),
//mDelay(120),
mAlloc(NULL)
{
@@ -60,6 +61,7 @@ BOOL LLMemoryView::handleMouseDown(S32 x, S32 y, MASK mask)
}
else
{
+ mPaused = !mPaused;
}
return TRUE;
}
@@ -172,7 +174,7 @@ void LLMemoryView::draw()
}
#else
- LLMemTracker::getInstance()->preDraw() ;
+ LLMemTracker::getInstance()->preDraw(mPaused) ;
{
F32 x_pos = MARGIN_AMT ;
diff --git a/indra/newview/llmemoryview.h b/indra/newview/llmemoryview.h
index 24ea058279..9bdc59ab10 100644
--- a/indra/newview/llmemoryview.h
+++ b/indra/newview/llmemoryview.h
@@ -55,6 +55,7 @@ public:
private:
std::vector<LLWString> mLines;
LLAllocator* mAlloc;
+ BOOL mPaused ;
};