diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-08-26 17:09:10 -0700 |
commit | 66500c7ad5d799eb56f8f56924a00744f4a90e3d (patch) | |
tree | fcd42e2c1853cdd897128d79b5b18eebbe32a32a /indra/newview/llface.h | |
parent | 225dd434cfeb6a67c5878b41538dafe2a7f4a284 (diff) | |
parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) |
merge
Diffstat (limited to 'indra/newview/llface.h')
-rw-r--r-- | indra/newview/llface.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 351d48a671..d95057f3ef 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -132,10 +132,10 @@ public: void unsetFaceColor(); // switch back to material color const LLColor4& getFaceColor() const { return mFaceColor; } const LLColor4& getRenderColor() const; - //for volumes void updateRebuildFlags(); + bool canRenderAsMask(); // logic helper BOOL getGeometryVolume(const LLVolume& volume, const S32 &f, const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, @@ -207,7 +207,8 @@ private: F32 adjustPartialOverlapPixelArea(F32 cos_angle_to_view_dir, F32 radius ); BOOL calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) ; public: - static F32 calcImportanceToCamera(F32 to_view_dir, F32 dist); + static F32 calcImportanceToCamera(F32 to_view_dir, F32 dist); + static F32 adjustPixelArea(F32 importance, F32 pixel_area) ; public: |