diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 36df2e0c2..d6ee77129 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -7499,11 +7499,13 @@ void LLAgent::sendAgentSetAppearance()
 			gSavedSettings.setString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd");
 		}
 
-		/*if(gSavedSettings.getString("AscentReportClientUUID") != "c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
+		if(gSavedSettings.getString("AscentReportClientUUID") != "c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
 		{
+			LLUUID old_teid;
 			U8 client_buffer[UUID_BYTES];
 			memset(&client_buffer, 0, UUID_BYTES);
-			LLTextureEntry* entry = LLPrimitive::getTE(0);// getTE(0);//   LLAgent::getAvatarObject()->mDrawable->getFace(0)->getT
+			LLTextureEntry* entry = (LLTextureEntry*)mAvatarObject->getTE(0);
+			old_teid = entry->getID();
 			//You edit this to change the tag in your client. Yes.
 			const char* tag_client = "Ascent";
 			strncpy((char*)&client_buffer[0], tag_client, UUID_BYTES);
@@ -7511,11 +7513,17 @@ void LLAgent::sendAgentSetAppearance()
 			memcpy(&part_a.mData, &client_buffer[0], UUID_BYTES);
 			entry->setColor(gSavedSettings.getColor4("AscentCustomTagColor") );
 			//This glow is used to tell if the tag color and name is set or not.
-			entry->setGlow(0.1);
+			entry->setGlow(0.1f);
 			entry->setID(part_a);
-		}*/
+			mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
+			entry->setID(old_teid);
+		}
+		else
+		{
+			mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
+		}
 
-		mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
+		
 	}
 	else
 	{
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index a6144cb9e..2614764a5 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -399,10 +399,10 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
 		if (mod)  item_perm_mask |= PERM_MODIFY;
 		if (xfer) item_perm_mask |= PERM_TRANSFER;
 		
-		// <edit>
-		//PermissionMask filter_perm_mask = mImmediateFilterPermMask;
-		//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
-		// </edit>
+
+		PermissionMask filter_perm_mask = mImmediateFilterPermMask;
+		if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
+
 		{
 			if (drop)
 			{
@@ -412,12 +412,10 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
 
 			*accept = ACCEPT_YES_SINGLE;
 		}
-		// <edit>
-		/*else
+		else
 		{
 			*accept = ACCEPT_NO;
-		}*/
-		// </edit>
+		}
 	}
 	else
 	{
@@ -1151,11 +1149,9 @@ void LLTextureCtrl::setEnabled( BOOL enabled )
 
 	mCaption->setEnabled( enabled );
 	mEnable = enabled;
-	// <edit>
-	/*
+
 	LLView::setEnabled( enabled );
-	*/
-	// </edit>
+
 }
 
 void LLTextureCtrl::setValid(BOOL valid )
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0e87a8900..cfe21fb4c 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3613,28 +3613,25 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					LLColor4 tag_color = texentry->getColor();
 					tag_color.setAlpha(alpha);
 					mNameText->setColor(tag_color);
-
-					// you probably had e-sex with this person
+				}
+				else
+				{
+					avatar_name_color.setAlpha(alpha);
+					//The old client identification.
+					if(isFullyLoaded())
+					{
+						//llinfos << "Getting client from deprecated method." << llendl;
+						getClientInfo(client,avatar_name_color);
+					}
 					if (LLAvatarTracker::instance().getBuddyInfo(this->getID()) != NULL)
 					{
 						if (gSavedSettings.getBOOL("AscentShowFriendsTag"))
 						{
-							client = "Friend"; // "fuckable";
+							client = "Friend";
 							avatar_name_color = gSavedSettings.getColor4("AscentFriendColor");
 						}
 					}
 				}
-				else
-				{
-					LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
-					avatar_name_color.setAlpha(alpha);
-					mNameText->setColor(avatar_name_color);
-					//The old client identification.
-					if(isFullyLoaded())
-					{
-						getClientInfo(client,avatar_name_color);
-					}
-				}
 
 				avatar_name_color.setAlpha(alpha);
 					
diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index 0176754d1..7c554b637 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -47,6 +47,7 @@
 
 BOOL firstBuildDone;
 void* fixPointer;
+std::string ButtonState;
 std::string current_preset = "Default";
 
 wlfPanel_AdvSettings::wlfPanel_AdvSettings()
@@ -61,10 +62,12 @@ void wlfPanel_AdvSettings::build()
 	if (!gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
 	{
 		LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings_expanded.xml", &getFactoryMap());
+		ButtonState = "arrow_up.tga";
 	}
 	else
 	{
 		LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings.xml", &getFactoryMap());
+		ButtonState = "arrow_down.tga";
 	}
 }
 
@@ -125,7 +128,7 @@ BOOL wlfPanel_AdvSettings::postBuild()
 void wlfPanel_AdvSettings::draw()
 {
 	LLButton* expand_button = getChild<LLButton>("expand");
-	if (expand_button)
+	/*if (expand_button)
 	{
 		if (expand_button->getToggleState())
 		{
@@ -135,7 +138,8 @@ void wlfPanel_AdvSettings::draw()
 		{
 			expand_button->setImageOverlay("arrow_up.tga");
 		}
-	}
+	}*/
+	expand_button->setImageOverlay(ButtonState);
 	refresh();
 	LLPanel::draw();