diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-27 15:49:15 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-27 15:49:15 +0200 |
| commit | d9064d3a4e83a44c518851643993b0b79ac33e13 (patch) | |
| tree | 5e214b16e161dbd485229b7fafcbf8c66a005f67 /indra/newview/llvovolume.h | |
| parent | 4c869a97c558c0fa5759b6cf2f560c26a89a09b2 (diff) | |
MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture.
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index a331908320..1a7e49d198 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -202,10 +202,10 @@ public: /*virtual*/ BOOL setMaterial(const U8 material); void setTexture(const S32 face); - S32 getIndexInTex() const {return mIndexInTex ;} + S32 getIndexInTex(U32 ch) const {return mIndexInTex[ch];} /*virtual*/ BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); void updateSculptTexture(); - void setIndexInTex(S32 index) { mIndexInTex = index ;} + void setIndexInTex(U32 ch, S32 index) { mIndexInTex[ch] = index ;} void sculpt(); static void rebuildMeshAssetCallback(LLVFS *vfs, const LLUUID& asset_uuid, @@ -370,7 +370,7 @@ private: LLPointer<LLViewerFetchedTexture> mLightTexture; media_list_t mMediaImplList; S32 mLastFetchedMediaVersion; // as fetched from the server, starts as -1 - S32 mIndexInTex; + S32 mIndexInTex[LLRender::NUM_VOLUME_TEXTURE_CHANNELS]; S32 mMDCImplCount; LLPointer<LLRiggedVolume> mRiggedVolume; |