diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
| commit | a7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch) | |
| tree | 3eddbd3f421f430c9b03487261e89c95017657b9 /indra/llcommon/llallocator.h | |
| parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
| parent | 77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff) | |
merge changes for DRTVWR-250
Diffstat (limited to 'indra/llcommon/llallocator.h')
| -rw-r--r-- | indra/llcommon/llallocator.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llcommon/llallocator.h b/indra/llcommon/llallocator.h index a91dd57d14..d26ad73c5b 100644 --- a/indra/llcommon/llallocator.h +++ b/indra/llcommon/llallocator.h @@ -29,16 +29,10 @@ #include <string> -#include "llmemtype.h" #include "llallocator_heap_profile.h" class LL_COMMON_API LLAllocator { friend class LLMemoryView; - friend class LLMemType; - -private: - static void pushMemType(S32 type); - static S32 popMemType(); public: void setProfilingEnabled(bool should_enable); |