diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:25:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:25:35 -0500 |
| commit | dd859c5e3eee97db614edc94d36b25d138fa9c5c (patch) | |
| tree | 12d1b281084bd0ec7cb6072fd99a5519304ec77a /indra/newview/llmemoryview.h | |
| parent | 5e6b4b5ad0dc56869430bcd31a942bdc7f8a2899 (diff) | |
| parent | 64f153d547fe5f24d03f37e5766ba41efe140f10 (diff) | |
merge changes for storm-351
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 ; }; |