diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-31 11:35:22 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-31 11:35:22 -0400 |
| commit | 51c7887f8d8ad0b22c8452f002d74afcc8fbea71 (patch) | |
| tree | decec7dc66cfe3ccf0d6b1498a7220530743ad4b /indra/llcommon/llmemory.h | |
| parent | f18cfe97750cc13374adab15636532fe0fbda19c (diff) | |
| parent | db363104dc4055b7ed15d695b23df99bb33eb1c8 (diff) | |
merge
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. |