diff options
| author | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 12:24:04 -0600 |
|---|---|---|
| committer | davep@billy.gateway.2wire.net <davep@billy.gateway.2wire.net> | 2010-02-09 12:24:04 -0600 |
| commit | 871a40f2f290106f9da58dd4d09cec28fbecb0fa (patch) | |
| tree | fab5c657732c6da25a4fbcbd837af7389ec283f5 /indra/newview/llvovolume.h | |
| parent | d1efc0fd52c0e5dc59951f50435e121305fe9b69 (diff) | |
| parent | 6d4b4762d1eb0a1431e1793a7254f8cac220062a (diff) | |
merge
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 280ffea76d..2776988a12 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -179,8 +179,10 @@ public: /*virtual*/ BOOL setMaterial(const U8 material); void setTexture(const S32 face); - + S32 getIndexInTex() const {return mIndexInTex ;} /*virtual*/ BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); + void updateSculptTexture(); + void setIndexInTex(S32 index) { mIndexInTex = index ;} void sculpt(); static void rebuildMeshAssetCallback(LLVFS *vfs, const LLUUID& asset_uuid, @@ -313,7 +315,7 @@ private: LLPointer<LLViewerFetchedTexture> mLightTexture; media_list_t mMediaImplList; S32 mLastFetchedMediaVersion; // as fetched from the server, starts as -1 - + S32 mIndexInTex; // statics public: static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop |