diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-09-19 13:13:37 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-09-19 13:13:37 -0400 |
commit | eaef5e63d5f5e3177fbd13de41aea12340f2fa30 (patch) | |
tree | 4da9c9af2741b2d33eb05cebe0291e50aada88ba /indra/newview/llpanelvolume.cpp | |
parent | 195d319f65239238577ae15c22188da3839ae5cf (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge. Pull in viewer-release after materials viewer 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); } } |