diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
| commit | 125e216603e949ac97e4d8b649390f7c41a743c0 (patch) | |
| tree | 4a7bfd367fd436738b13bfa6946137b300568a02 /indra/newview/llmemoryview.h | |
| parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
| parent | 948afb8ef436f661dd84e3c343e22934f92570ec (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llmemoryview.h')
| -rw-r--r-- | indra/newview/llmemoryview.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 ; }; |