diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-02 13:12:08 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-02 13:12:08 -0700 |
| commit | f1c04467f70ce7e5a048614fa7db631cd3a35a00 (patch) | |
| tree | d301f853010620feeb374f7490f21e1028cef868 /indra/newview/llpanelvolume.cpp | |
| parent | dd31d9941fe1bfbccdfd0428abbe803b6c495f6c (diff) | |
NORSPEC-292 fix issues with managing LLNetworkData::PARAMS_LIGHT_IMAGE when demoting spotlights by removing their tex
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rwxr-xr-x | indra/newview/llpanelvolume.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 02d363d795..0b501f6a74 100755 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -710,9 +710,20 @@ 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); + volobjp->setIsLight(TRUE,TRUE); } } |