Revert "THE BIGGIE."

This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml

indra/llcommon/llassettype.cpp

@@ -70,8 +70,6 @@ asset_info_t asset_types[] =
 	{ LLAssetType::AT_ANIMATION, "ANIMATION" },
 	{ LLAssetType::AT_GESTURE, "GESTURE" },
 	{ LLAssetType::AT_SIMSTATE, "SIMSTATE" },
-	{ LLAssetType::AT_LINK, "LINK" },
-	{ LLAssetType::AT_LINK_FOLDER, "FOLDER_LINK" },
 	{ LLAssetType::AT_NONE, "NONE" },
 };
 
@@ -131,10 +129,7 @@ const char* LLAssetType::mAssetTypeNames[LLAssetType::AT_COUNT] =
 	"jpeg",
 	"animatn",
 	"gesture",
-	"simstate",
-	"",
-	"link",
-	"link_f"
+	"simstate"
 };
 
 // This table is meant for decoding to human readable form. Put any
@@ -164,10 +159,7 @@ const char* LLAssetType::mAssetTypeHumanNames[LLAssetType::AT_COUNT] =
 	"jpeg image",
 	"animation",
 	"gesture",
-	"simstate",
-	"",
-	"symbolic link",
-	"symbolic folder link"
+	"simstate"
 };
 
 ///----------------------------------------------------------------------------
@@ -256,7 +248,6 @@ EDragAndDropType LLAssetType::lookupDragAndDropType( EType asset )
 	case AT_BODYPART:		return DAD_BODYPART;
 	case AT_ANIMATION:		return DAD_ANIMATION;
 	case AT_GESTURE:		return DAD_GESTURE;
-	case AT_LINK:			return DAD_LINK;
 	default: 				return DAD_NONE;
 	};
 }
@@ -274,16 +265,3 @@ void LLAssetType::generateDescriptionFor(LLAssetType::EType type,
 	desc.assign(time_str);
 	desc.append(LLAssetType::lookupHumanReadable(type));
 }
-// static
-bool LLAssetType::lookupCanLink(EType asset_type)
-{
-	return (asset_type == AT_CLOTHING || asset_type == AT_OBJECT || asset_type == AT_CATEGORY ||
-			asset_type == AT_BODYPART || asset_type == AT_GESTURE);
-}
-
-// static
-// Not adding this to dictionary since we probably will only have these two types
-bool LLAssetType::lookupIsLinkType(EType asset_type)
-{
-	return (asset_type == AT_LINK || asset_type == AT_LINK_FOLDER);
-}