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/llinventory/llinventory.cpp

@@ -126,25 +126,6 @@ const std::string& LLInventoryObject::getName() const
 	return mName;
 }
 
-// To bypass linked items, since llviewerinventory's getType
-// will return the linked-to item's type instead of this object's type.
-LLAssetType::EType LLInventoryObject::getActualType() const
-{
-	return mType;
-}
-
-BOOL LLInventoryObject::getIsLinkType() const
-{
-	return LLAssetType::lookupIsLinkType(mType);
-}
-
-// See LLInventoryItem override.
-// virtual
-const LLUUID& LLInventoryObject::getLinkedUUID() const
-{
-	return mUUID;
-}
-
 LLAssetType::EType LLInventoryObject::getType() const
 {
 	return mType;
@@ -361,19 +342,6 @@ void LLInventoryItem::cloneItem(LLPointer<LLInventoryItem>& newitem) const
 	newitem->mUUID.generate();
 }
 
-// If this is a linked item, then the UUID of the base object is
-// this item's assetID.
-// virtual
-const LLUUID& LLInventoryItem::getLinkedUUID() const
-{
-	if (LLAssetType::lookupIsLinkType(getActualType()))
-	{
-		return mAssetUUID;
-	}
-
-	return LLInventoryObject::getLinkedUUID();
-}
-
 const LLPermissions& LLInventoryItem::getPermissions() const
 {
 	return mPermissions;