summaryrefslogtreecommitdiff
path: root/indra/newview/llface.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-08-18 11:33:01 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-08-18 11:33:01 -0600
commit247ca1660bf4029d4e5bb701654433f14c785ab5 (patch)
tree1bcc6a234b1c3dd6908c9a1999a3dce19a4da566 /indra/newview/llface.h
parent2afe1f3999f85e21f2cdfcb614670b89762dfeef (diff)
EXT-8673: FIXED: UDP texture loading is slower in 2.x viewers than 1.23.5
Improved the following: 1, make sure the texture callback queue is properly handled and cleaned in time; 2, estimate the LLVOTree pixel area more accurately; 3, eliminate the possibility of back and forth stopping/restarting a texture fetching
Diffstat (limited to 'indra/newview/llface.h')
-rw-r--r--indra/newview/llface.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index b20ecfe2b8..8f17bc3178 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 LLFace::adjustPixelArea(F32 importance, F32 pixel_area) ;
public: