merge

1 files changed, 8 insertions, 11 deletions

diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 5c4c430f83..6c17fb9f8d 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -737,22 +737,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);
-	}
-
 	LLVOVolume *volobjp = (LLVOVolume *) mObject.get();
-	if(volobjp)
+
+	if (volobjp && LightTextureCtrl)
 	{
 		// Cancel the light texture as requested
 		// NORSPEC-292
-		//
+        //
+        // Texture picker triggers cancel both in case of actual cancel and in case of
+        // selection of "None" texture.
+        LLUUID tex_id = LightTextureCtrl->getImageAssetID();
         bool is_spotlight = volobjp->isLightSpotlight();
-        volobjp->setLightTextureID(mLightSavedTexture); //updates spotlight
+        volobjp->setLightTextureID(tex_id); //updates spotlight
 
-        if (!is_spotlight && mLightSavedTexture.notNull())
+        if (!is_spotlight && tex_id.notNull())
         {
             LLVector3 spot_params = volobjp->getSpotLightParams();
             getChild<LLUICtrl>("Light FOV")->setValue(spot_params.mV[0]);
@@ -796,7 +794,6 @@ void LLPanelVolume::onLightSelectTexture(const LLSD& data)
 	{
 		LLUUID id = LightTextureCtrl->getImageAssetID();
 		volobjp->setLightTextureID(id);
-		mLightSavedTexture = id;
 	}
 }