Merge cleanup

meow-7.2.2
Ansariel 2016-09-16 15:07:42 +02:00
parent f0366fa155
commit eb6d5e7004
1 changed files with 0 additions and 2 deletions

View File

@ -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,