QAR-377 maintenance-6 merge:

 svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/

1 files changed, 0 insertions, 33 deletions

diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
index c94ee7c54e..4e030c7abc 100644
--- a/indra/newview/llwearablelist.cpp
+++ b/indra/newview/llwearablelist.cpp
@@ -207,39 +207,6 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 }
 
 
-LLWearable* LLWearableList::createLegacyWearableFromAvatar( EWearableType type )
-{
-	llinfos << "LLWearableList::createLegacyWearableFromAvatar" << llendl;
-	
-	LLTransactionID tid;
-	LLAssetID new_asset_id;
-	tid.generate();
-	new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-	
-	LLWearable* wearable = new LLWearable( tid );
-	wearable->setType( type );
-	wearable->setName( wearable->getTypeLabel() );
-	wearable->setDescription( "Recovered from lost asset." );
-
-	LLVOAvatar* avatar = gAgent.getAvatarObject();
-	LLPermissions perm;
-	perm.init( avatar->getID(), avatar->getID(), LLUUID::null, LLUUID::null );
-	perm.initMasks(PERM_TRANSFER, PERM_TRANSFER, PERM_NONE, PERM_NONE, PERM_MOVE | PERM_TRANSFER);
-	wearable->setPermissions( perm );
-	
-	// Save info is the default.
-
-	wearable->readFromAvatar();
-	
-	mList[ new_asset_id ] = wearable;
-
-	// Send to the dataserver
-	wearable->saveNewAsset();
-
-	return wearable;
-}
-
-
 // Creates a new wearable just like the old_wearable but with data copied over from item
 LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* old_wearable, LLViewerInventoryItem* item )
 {