diff options
author | Jacek Antonelli | 2008-08-15 23:44:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:57 -0500 |
commit | da68d3a57ecb27eba5d7efb8ff77d9640c0be65e (patch) | |
tree | f2fa2b9ed6e8cf49c8a3cb2a1893c4e5c61916a1 /linden/indra/newview/llvovolume.h | |
parent | Second Life viewer sources 1.15.1.3 (diff) | |
download | meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.zip meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.gz meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.bz2 meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.xz |
Second Life viewer sources 1.16.0.5
Diffstat (limited to 'linden/indra/newview/llvovolume.h')
-rw-r--r-- | linden/indra/newview/llvovolume.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h index 80e4e8a..14c640f 100644 --- a/linden/indra/newview/llvovolume.h +++ b/linden/indra/newview/llvovolume.h | |||
@@ -152,6 +152,7 @@ public: | |||
152 | void setTexture(const S32 face); | 152 | void setTexture(const S32 face); |
153 | 153 | ||
154 | /*virtual*/ BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); | 154 | /*virtual*/ BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); |
155 | void sculpt(); | ||
155 | void updateRelativeXform(); | 156 | void updateRelativeXform(); |
156 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); | 157 | /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); |
157 | /*virtual*/ void updateFaceSize(S32 idx); | 158 | /*virtual*/ void updateFaceSize(S32 idx); |
@@ -197,6 +198,7 @@ public: | |||
197 | // Flexible Objects | 198 | // Flexible Objects |
198 | U32 getVolumeInterfaceID() const; | 199 | U32 getVolumeInterfaceID() const; |
199 | virtual BOOL isFlexible() const; | 200 | virtual BOOL isFlexible() const; |
201 | virtual BOOL isSculpted() const; | ||
200 | BOOL isVolumeGlobal() const; | 202 | BOOL isVolumeGlobal() const; |
201 | BOOL canBeFlexible() const; | 203 | BOOL canBeFlexible() const; |
202 | BOOL setIsFlexible(BOOL is_flexible); | 204 | BOOL setIsFlexible(BOOL is_flexible); |
@@ -223,12 +225,14 @@ protected: | |||
223 | LLFrameTimer mTextureUpdateTimer; | 225 | LLFrameTimer mTextureUpdateTimer; |
224 | S32 mLOD; | 226 | S32 mLOD; |
225 | BOOL mLODChanged; | 227 | BOOL mLODChanged; |
228 | BOOL mSculptChanged; | ||
226 | F32 mRadius; | 229 | F32 mRadius; |
227 | LLMatrix4 mRelativeXform; | 230 | LLMatrix4 mRelativeXform; |
228 | LLMatrix3 mRelativeXformInvTrans; | 231 | LLMatrix3 mRelativeXformInvTrans; |
229 | BOOL mVolumeChanged; | 232 | BOOL mVolumeChanged; |
230 | F32 mVObjRadius; | 233 | F32 mVObjRadius; |
231 | LLVolumeInterface *mVolumeImpl; | 234 | LLVolumeInterface *mVolumeImpl; |
235 | LLPointer<LLViewerImage> mSculptTexture; | ||
232 | 236 | ||
233 | // statics | 237 | // statics |
234 | public: | 238 | public: |