diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
| commit | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (patch) | |
| tree | e777c21cf2a9e1d2a115c96bff080ebe2d0edb31 /indra/newview/lldrawable.h | |
| parent | ce417a01c9a5cb0befc68533734d98023a03b96e (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rw-r--r-- | indra/newview/lldrawable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 960c64fa9e..b1e32bdb5b 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -292,6 +292,7 @@ public: RIGGED = 0x08000000, PARTITION_MOVE = 0x10000000, ANIMATED_CHILD = 0x20000000, + ACTIVE_CHILD = 0x40000000, } EDrawableFlags; private: //aligned members @@ -305,8 +306,6 @@ public: LLPointer<LLDrawable> mParent; F32 mDistanceWRTCamera; - - S32 mQuietCount; static S32 getCurrentFrame() { return sCurVisible; } static S32 getMinVisFrameRange(); |