From 91b4e9b24bd69ba1fe51dffc8c5148d5451ded6d Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 3 Dec 2015 21:58:42 +0200
Subject: MAINT-1274 FIXED Cancel in Light Texture Picker does not reverts
 texture.

---
 indra/newview/llpanelvolume.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 7405f88fe7..c9f8683e0e 100755
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -713,7 +713,7 @@ void LLPanelVolume::onLightCancelTexture(const LLSD& data)
 
 	if (LightTextureCtrl)
 	{
-		LightTextureCtrl->setImageAssetID(LLUUID::null);
+        LightTextureCtrl->setImageAssetID(mLightSavedTexture);
 	}
 
 	LLVOVolume *volobjp = (LLVOVolume *) mObject.get();
@@ -722,7 +722,16 @@ void LLPanelVolume::onLightCancelTexture(const LLSD& data)
 		// Cancel the light texture as requested
 		// NORSPEC-292
 		//
-		volobjp->setLightTextureID(LLUUID::null);
+        bool is_spotlight = volobjp->isLightSpotlight();
+        volobjp->setLightTextureID(mLightSavedTexture); //updates spotlight
+
+        if (!is_spotlight && mLightSavedTexture.notNull())
+        {
+            LLVector3 spot_params = volobjp->getSpotLightParams();
+            getChild<LLUICtrl>("Light FOV")->setValue(spot_params.mV[0]);
+            getChild<LLUICtrl>("Light Focus")->setValue(spot_params.mV[1]);
+            getChild<LLUICtrl>("Light Ambiance")->setValue(spot_params.mV[2]);
+        }
 	}
 }
 
-- 
cgit v1.2.3