Fixed hitting cancel on bump map textures removing the texture that was already there.

indra/newview/llpanelface.cpp

@@ -1866,6 +1866,8 @@ void LLPanelFace::onCancelNormalTexture(const LLSD& data)
 	U8 bumpy = 0;
 	bool identical_bumpy = false;
 	LLSelectedTE::getBumpmap(bumpy, identical_bumpy);
+	LLUUID norm_map_id = mBumpyTextureCtrl->getImageAssetID();
+	bumpy = norm_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
 	sendBump(bumpy);
 }