diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index c6b6acf82..07f6a843d 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -102,6 +102,8 @@ void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool
 		}
 		if (chat.mText != "")
 		{
+			chat.mFromName = name;
+			chat.mURL = llformat("secondlife:///app/agent/%s/about",key.asString().c_str());
 			chat.mSourceType = CHAT_SOURCE_SYSTEM;
 			LLFloaterChat::addChat(chat);
 		}
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index b56449de3..4f742b0a2 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -402,7 +402,6 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
 		// <edit>
 		//PermissionMask filter_perm_mask = mImmediateFilterPermMask;
 		//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
-		if(1)
 		// </edit>
 		{
 			if (drop)
@@ -413,10 +412,12 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
 
 			*accept = ACCEPT_YES_SINGLE;
 		}
-		else
+		// <edit>
+		/*else
 		{
 			*accept = ACCEPT_NO;
-		}
+		}*/
+		// </edit>
 	}
 	else
 	{
@@ -1256,12 +1257,22 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 	BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
 	if( handled )
 	{
-		showPicker(FALSE);
+		// <edit>
+		if( mask & MASK_CONTROL )
+		{
+			LLLocalInventory::addItem(mImageAssetID.asString(), (int)LLAssetType::AT_TEXTURE, mImageAssetID, true);
+		}
+		else
+		{
+		// </edit>
+			showPicker(FALSE);
 
-		//grab textures first...
-		gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE));
-		//...then start full inventory fetch.
-		gInventory.startBackgroundFetch();
+			//grab textures first...
+			gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE));
+			//...then start full inventory fetch.
+			gInventory.startBackgroundFetch();
+		//<edit>
+		}
 	}
 	return handled;
 }
@@ -1453,7 +1464,6 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
 	// <edit>
 	//PermissionMask filter_perm_mask = mImmediateFilterPermMask;
 	//if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
-	if(1)
 	// </edit>
 	{
 		if(mDragCallback)
@@ -1465,10 +1475,12 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
 			return TRUE;
 		}
 	}
-	else
+	// <edit>
+	/*else
 	{
 		return FALSE;
-	}
+	}*/
+	// </edit>
 }
 
 BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)