diff options
| author | Richard Linden <none@none> | 2013-09-25 19:15:38 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-25 19:15:38 -0700 |
| commit | 1aec07aecfd1a39adf83589473cd7c3cfbc1cd76 (patch) | |
| tree | 73cffad3bcac98ee86f4368aebdd8a37ab0ead02 /indra/newview/llviewerobject.cpp | |
| parent | 4aa41f80bae421109900321af1d090ba5c8e6fdb (diff) | |
| parent | 053d97db1b283ca2548dc1f64756ddfc5166158f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 2c1ab3a73b..394b11b759 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -112,7 +112,6 @@ 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); |