aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvovolume.h
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-09 21:11:42 -0600
committerJacek Antonelli2010-02-16 18:50:15 -0600
commite6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch)
tree10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/llvovolume.h
parentPorted some cURL and HTTP-related changes from Snowglobe. (diff)
downloadmeta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/newview/llvovolume.h')
-rw-r--r--linden/indra/newview/llvovolume.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 9b4e715..960f6da 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -130,7 +130,7 @@ public:
130 130
131 131
132 BOOL getVolumeChanged() const { return mVolumeChanged; } 132 BOOL getVolumeChanged() const { return mVolumeChanged; }
133 F32 getTextureVirtualSize(LLFace* face); 133
134 /*virtual*/ F32 getRadius() const { return mVObjRadius; }; 134 /*virtual*/ F32 getRadius() const { return mVObjRadius; };
135 const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const; 135 const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const;
136 136
@@ -177,8 +177,8 @@ public:
177 /*virtual*/ void updateFaceSize(S32 idx); 177 /*virtual*/ void updateFaceSize(S32 idx);
178 /*virtual*/ BOOL updateLOD(); 178 /*virtual*/ BOOL updateLOD();
179 void updateRadius(); 179 void updateRadius();
180 /*virtual*/ void updateTextures(LLAgent &agent); 180 /*virtual*/ void updateTextures();
181 void updateTextures(); 181 void updateTextureVirtualSize();
182 182
183 void updateFaceFlags(); 183 void updateFaceFlags();
184 void regenFaces(); 184 void regenFaces();