From 1874170f4f2bc826a6ea03473ab52c0952a7247d Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 22 Jul 2014 15:43:18 +0300
Subject: MAINT-4255 FIXED In the Edit menu when opening the texture picker for
 normal map selection and clicking Cancel the already applied texture is
 changed to None even with or without any prior change or if the prior applied
 texture was full perms.

---
 indra/newview/llpanelface.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llpanelface.cpp')

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index e3be1312e4..02e05d3d9a 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1848,6 +1848,8 @@ void LLPanelFace::onCancelNormalTexture(const LLSD& data)
 	U8 bumpy = 0;
 	bool identical_bumpy = false;
 	LLSelectedTE::getBumpmap(bumpy, identical_bumpy);
+	LLUUID spec_map_id = getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID();
+	bumpy = spec_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
 	sendBump(bumpy);
 }
 
-- 
cgit v1.2.3