From eb6d5e700426c9626bb920a672f62c5f7bc0d042 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 16 Sep 2016 15:07:42 +0200
Subject: [PATCH] Merge cleanup

---
 indra/newview/lltexturectrl.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 2895456e55..4d0ae2864f 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -81,8 +81,6 @@ static const S32 LOCAL_TRACKING_ID_COLUMN = 1;
 //static const char WHITE_IMAGE_NAME[] = "Blank Texture";
 //static const char NO_IMAGE_NAME[] = "None";
 
-	static void		onBtnTransparent( void* userdata ); // <FS:PP> FIRE-5082: "Transparent" button in Texture Panel
-	LLUUID				mTransparentImageAssetID; // <FS:PP> FIRE-5082: "Transparent" button in Texture Panel
 LLFloaterTexturePicker::LLFloaterTexturePicker(	
 	LLView* owner,
 	LLUUID image_asset_id,