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.h | |
| parent | 4aa41f80bae421109900321af1d090ba5c8e6fdb (diff) | |
| parent | 053d97db1b283ca2548dc1f64756ddfc5166158f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x | indra/newview/llviewerobject.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index e3972ccae8..56518cca69 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -661,7 +661,6 @@ public: LLPointer<class LLHUDIcon> mIcon; static BOOL sUseSharedDrawables; - //static LLTrace::MemStatHandle sMemStat; protected: // delete an item in the inventory, but don't tell the |