diff options
Diffstat (limited to 'linden/indra/newview/llvovolume.h')
-rw-r--r-- | linden/indra/newview/llvovolume.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h index a78aa37..7c8a68d 100644 --- a/linden/indra/newview/llvovolume.h +++ b/linden/indra/newview/llvovolume.h | |||
@@ -169,8 +169,10 @@ public: | |||
169 | /*virtual*/ BOOL setMaterial(const U8 material); | 169 | /*virtual*/ BOOL setMaterial(const U8 material); |
170 | 170 | ||
171 | void setTexture(const S32 face); | 171 | void setTexture(const S32 face); |
172 | 172 | S32 getIndexInTex() const {return mIndexInTex ;} | |
173 | /*virtual*/ BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); | 173 | /*virtual*/ BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); |
174 | void updateSculptTexture(); | ||
175 | void setIndexInTex(S32 index) { mIndexInTex = index ;} | ||
174 | void sculpt(); | 176 | void sculpt(); |
175 | void updateRelativeXform(); | 177 | void updateRelativeXform(); |
176 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); | 178 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); |
@@ -231,7 +233,6 @@ private: | |||
231 | LLFrameTimer mTextureUpdateTimer; | 233 | LLFrameTimer mTextureUpdateTimer; |
232 | S32 mLOD; | 234 | S32 mLOD; |
233 | BOOL mLODChanged; | 235 | BOOL mLODChanged; |
234 | S32 mSculptLevel; | ||
235 | BOOL mSculptChanged; | 236 | BOOL mSculptChanged; |
236 | LLMatrix4 mRelativeXform; | 237 | LLMatrix4 mRelativeXform; |
237 | LLMatrix3 mRelativeXformInvTrans; | 238 | LLMatrix3 mRelativeXformInvTrans; |
@@ -239,6 +240,7 @@ private: | |||
239 | F32 mVObjRadius; | 240 | F32 mVObjRadius; |
240 | LLVolumeInterface *mVolumeImpl; | 241 | LLVolumeInterface *mVolumeImpl; |
241 | LLPointer<LLViewerImage> mSculptTexture; | 242 | LLPointer<LLViewerImage> mSculptTexture; |
243 | S32 mIndexInTex; | ||
242 | 244 | ||
243 | // statics | 245 | // statics |
244 | public: | 246 | public: |