diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/llvoavatar.h | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index ff846c8d83..2ed0f1ec9b 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -439,6 +439,8 @@ public: BOOL isCulled() { return mCulled; } S32 getUnbakedPixelAreaRank(); + void setVisibilityRank(U32 rank); + U32 getVisibilityRank(); static void cullAvatarsByPixelArea(); void dumpLocalTextures(); @@ -717,8 +719,9 @@ public: LLVector3 mImpostorExtents[2]; LLVector3 mImpostorAngle; F32 mImpostorDistance; + F32 mImpostorPixelArea; LLVector3 mLastAnimExtents[2]; - + //-------------------------------------------------------------------- // Misc Render State //-------------------------------------------------------------------- @@ -956,6 +959,10 @@ protected: U32 mLowerMaskTexName; BOOL mCulled; + U32 mVisibilityRank; + F32 mFadeTime; + F32 mLastFadeTime; + F32 mLastFadeDistance; F32 mMinPixelArea; // debug F32 mMaxPixelArea; // debug |