Initial AISv3 merge. New HTTP messages not plugged in yet.

2015-06-25 20:16:30 -05:00
parent 09f4528bfb
commit 9f10d9510d
71 changed files with 4962 additions and 3452 deletions
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -753,15 +753,11 @@ void LLFloaterCustomize::saveCurrentWearables()
 				if (link_item)
 				{
 					// Create new link
-					link_inventory_item( gAgent.getID(),
-										 link_item->getLinkedUUID(),
+					link_inventory_object(
 										 LLAppearanceMgr::instance().getCOF(),
-										 link_item->getName(),
-										 description,
-										 LLAssetType::AT_LINK,
-										 NULL);
+										 link_item, NULL);
 					// Remove old link
-					gInventory.purgeObject(link_item->getUUID());
+					remove_inventory_object(link_item->getUUID(), NULL);
 				}
 			}
 			gAgentWearables.saveWearable( cur, i );