diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-01 01:00:52 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-01 01:00:52 +0200 |
| commit | 8fbc0aada88c6a3743f61dfc57018385a31802f0 (patch) | |
| tree | 56888fe7f24736cce1980e08d349d20f84b814ed /indra/newview/llviewerobject.h | |
| parent | a12200b91b0ca20dfff2df8aa71c6f53ac0603ee (diff) | |
| parent | d2a17e20ca889851406f22907df35b17f5030279 (diff) | |
merging
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 1fb30db8f2..97cf0a4850 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -34,7 +34,6 @@ #include "llhudicon.h" #include "llinventory.h" #include "llrefcount.h" -#include "llmemtype.h" #include "llprimitive.h" #include "lluuid.h" #include "llvoinventorylistener.h" @@ -128,7 +127,6 @@ public: typedef const child_list_t const_child_list_t; LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp, BOOL is_global = FALSE); - MEM_TYPE_NEW(LLMemType::MTYPE_OBJECT); virtual void markDead(); // Mark this object as dead, and clean up its references BOOL isDead() const {return mDead;} |