diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-19 16:23:42 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-19 16:23:42 +0300 |
| commit | 4eb1e2356f2c3103b7bd550b9fccf5d41791dc08 (patch) | |
| tree | 01f83c6047ab5f1ceafcfc4d2d253ac9e87cdc77 /indra/newview/llface.h | |
| parent | ab909a96a14d06168458df575153cf607e9ec4d8 (diff) | |
| parent | ebab718f32b58ca5a718e8db549ca9d36550bdcf (diff) | |
Merge from default branch. Fixed gcc build.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index b20ecfe2b8..13d3d8824e 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -138,10 +138,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, @@ -214,6 +214,7 @@ private: BOOL calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) ; public: static F32 calcImportanceToCamera(F32 to_view_dir, F32 dist); + static F32 adjustPixelArea(F32 importance, F32 pixel_area) ; public: |