diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
| commit | a6c20ae524610de2f8681cff8353d062a69b923e (patch) | |
| tree | 929e4a253e4b83ca7e07543916e709d50fdf855e /indra/newview/llpanelvolume.cpp | |
| parent | 6c13c4dd552a05cf055a90bdd90937de9f3903a5 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
merging
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); } } |