diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-18 18:24:16 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-18 18:24:16 -0700 |
| commit | 95e34d86b9d86b3b3c7d3c39620e35b06f8fa9cf (patch) | |
| tree | 5a2652bef97f1bb2d76c0b86482cebe2b2505a79 /indra/newview/llpanelvolume.cpp | |
| parent | 93503a05ec905ef2a8df39802fdc3475c961f3bc (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
The unbearable lightness of being norspec
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); } } |