diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:07:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:07:45 -0500 |
| commit | 89b75e75315592da9f4aac2ed851b61f1ac20851 (patch) | |
| tree | 80e8466a755f7ecc86a9a3834fc6d5777fa5fc48 /indra/llcommon/llmemory.h | |
| parent | 22dd6acbc969f604c120a9ca06cfbef6eb8d29a4 (diff) | |
| parent | 02554b74827bdade4b8e3f23c4e7325ddd347040 (diff) | |
merge changes for vmrg-181
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rw-r--r-- | indra/llcommon/llmemory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 74cf42c894..bbbdaa6497 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -394,12 +394,12 @@ public: LLPrivateMemoryPool* newPool(S32 type) ; void deletePool(LLPrivateMemoryPool* pool) ; -private: - static LLPrivateMemoryPoolManager* sInstance ; - std::vector<LLPrivateMemoryPool*> mPoolList ; - BOOL mPrivatePoolEnabled; +private: + std::vector<LLPrivateMemoryPool*> mPoolList ; U32 mMaxPrivatePoolSize; + static LLPrivateMemoryPoolManager* sInstance ; + static BOOL sPrivatePoolEnabled; static std::vector<LLPrivateMemoryPool*> sDanglingPoolList ; public: //debug and statistics info. |