diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
| commit | d9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch) | |
| tree | 39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/newview/llpanelvolume.cpp | |
| parent | c8144f7405178621f779b814fd4cb3e632786e0a (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge with 3.6.6-release
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rwxr-xr-x | indra/newview/llpanelvolume.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 02d363d795..a1d60b5b16 100755 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -710,9 +710,19 @@ void LLPanelVolume::onLightCancelColor(const LLSD& data) void LLPanelVolume::onLightCancelTexture(const LLSD& data) { LLTextureCtrl* LightTextureCtrl = getChild<LLTextureCtrl>("light texture control"); + if (LightTextureCtrl) { - LightTextureCtrl->setImageAssetID(mLightSavedTexture); + LightTextureCtrl->setImageAssetID(LLUUID::null); + } + + LLVOVolume *volobjp = (LLVOVolume *) mObject.get(); + if(volobjp) + { + // Cancel the light texture as requested + // NORSPEC-292 + // + volobjp->setLightTextureID(LLUUID::null); } } |