diff options
author | Richard Linden <none@none> | 2013-07-01 18:50:51 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-07-01 18:50:51 -0700 |
commit | 8208a40412fac35593d4b8b13f43c6be5e4d6990 (patch) | |
tree | 471e6f687612b1c6960f28ef8acda809526d68ad /indra/newview/llviewerobject.cpp | |
parent | 04bdc8ba83c297945dd60489c241b88adf892ff4 (diff) |
BUILDFIX: reverted changes that attempted to automate mem track
stat definition as they don't work on gcc/clang
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rwxr-xr-x | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c633e3acdd..4e514ddfd1 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -114,6 +114,8 @@ BOOL LLViewerObject::sMapDebug = TRUE; LLColor4 LLViewerObject::sEditSelectColor( 1.0f, 1.f, 0.f, 0.3f); // Edit OK LLColor4 LLViewerObject::sNoEditSelectColor( 1.0f, 0.f, 0.f, 0.3f); // Can't edit S32 LLViewerObject::sAxisArrowLength(50); +LLTrace::MemStatHandle LLViewerObject::sMemStat("LLViewerObject"); + BOOL LLViewerObject::sPulseEnabled(FALSE); BOOL LLViewerObject::sUseSharedDrawables(FALSE); // TRUE |