Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/

--HG--
branch : avatar-pipeline

4 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index e46cfe6af9..91c8177e20 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -811,7 +811,7 @@ bool areMatchingWearables(const LLViewerInventoryItem *a, const LLViewerInventor
 			(a->getWearableType() == b->getWearableType()));
 }
 
-void LLAppearanceManager::wearItem( LLInventoryItem* item, bool do_update )
+void LLAppearanceManager::addItemLink( LLInventoryItem* item, bool do_update )
 {
 	LLViewerInventoryItem *vitem = dynamic_cast<LLViewerInventoryItem*>(item);
 	if (!vitem)
@@ -864,7 +864,7 @@ void LLAppearanceManager::wearItem( LLInventoryItem* item, bool do_update )
 	return;
 }
 
-void LLAppearanceManager::wearEnsemble( LLInventoryCategory* cat, bool do_update )
+void LLAppearanceManager::addEnsembleLink( LLInventoryCategory* cat, bool do_update )
 {
 #if SUPPORT_ENSEMBLES
 	// BAP add check for already in COF.
@@ -978,7 +978,7 @@ void LLAppearanceManager::registerAttachment(const LLUUID& item_id)
 		   if (item)
 		   {
 			   //LLAppearanceManager::dumpCat(LLAppearanceManager::getCOF(),"Adding attachment link:");
-			   LLAppearanceManager::wearItem(item,false);  // Add COF link for item.
+			   LLAppearanceManager::addItemLink(item,false);  // Add COF link for item.
 			   gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 			   gInventory.notifyObservers();
 		   }
@@ -1018,7 +1018,7 @@ void LLAppearanceManager::linkRegisteredAttachments()
 		LLViewerInventoryItem *item = gInventory.getItem(item_id);
 		if (item)
 		{
-			wearItem(item, false);
+			addItemLink(item, false);
 			gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
 			gInventory.notifyObservers();
 		}
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 736dabea31..88d3320d1f 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -54,10 +54,10 @@ public:
 	void changeOutfit(bool proceed, const LLUUID& category, bool append);
 
 	// Add COF link to individual item.
-	void wearItem(LLInventoryItem* item, bool do_update = true);
+	void addItemLink(LLInventoryItem* item, bool do_update = true);
 
 	// Add COF link to ensemble folder.
-	void wearEnsemble(LLInventoryCategory* item, bool do_update = true);
+	void addEnsembleLink(LLInventoryCategory* item, bool do_update = true);
 
 	// Copy all items in a category.
 	void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id,
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 7d2922b561..d7be09efa9 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1686,7 +1686,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 				// BAP - should skip if dup.

 				if (move_is_into_current_outfit)

 				{

-					LLAppearanceManager::instance().wearEnsemble(inv_cat);

+					LLAppearanceManager::instance().addEnsembleLink(inv_cat);

 				}

 				else

 				{

@@ -2088,7 +2088,7 @@ void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model
 		if(!model) return;

 		LLViewerInventoryCategory* cat = getCategory();

 		if(!cat) return;

-		LLAppearanceManager::instance().wearEnsemble(cat,true);

+		LLAppearanceManager::instance().addEnsembleLink(cat,true);

 		return;

 	}

 #endif

@@ -2336,7 +2336,7 @@ void LLFolderBridge::pasteLinkFromClipboard()
 			{

 				link_inventory_item(

 					gAgent.getID(),

-					item->getUUID(),

+					item->getLinkedUUID(),

 					parent_id,

 					item->getName(),

 					LLAssetType::AT_LINK,

@@ -2948,16 +2948,16 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 				// BAP - should skip if dup.

 				if (move_is_into_current_outfit)

 				{

-					LLAppearanceManager::instance().wearItem(inv_item);

+					LLAppearanceManager::instance().addItemLink(inv_item);

 				}

 				else

 				{

 					LLPointer<LLInventoryCallback> cb = NULL;

 					link_inventory_item(

 						gAgent.getID(),

-						inv_item->getUUID(),

+						inv_item->getLinkedUUID(),

 						mUUID,

-						std::string(),

+						inv_item->getName(),

 						LLAssetType::AT_LINK,

 						cb);

 				}

@@ -4043,7 +4043,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		LLInventoryItem* item = getItem();

 		if (item && item->getIsLinkType())

 		{

-			items.push_back(std::string("Goto Link"));

+			items.push_back(std::string("Find Original"));

 		}

 

 		items.push_back(std::string("Properties"));

@@ -4196,7 +4196,7 @@ void wear_inventory_item_on_avatar( LLInventoryItem* item )
 		lldebugs << "wear_inventory_item_on_avatar( " << item->getName()

 				 << " )" << llendl;

 

-		LLAppearanceManager::instance().wearItem(item);

+		LLAppearanceManager::instance().addItemLink(item);

 	}

 }

 

@@ -4479,7 +4479,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 

 		if (item && item->getIsLinkType())

 		{

-			items.push_back(std::string("Goto Link"));

+			items.push_back(std::string("Find Original"));

 		}

 

 		items.push_back(std::string("Properties"));

@@ -5143,7 +5143,7 @@ void LLLinkFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	}

 	else

 	{

-		items.push_back(std::string("Goto Link"));

+		items.push_back(std::string("Find Original"));

 		items.push_back(std::string("Delete"));

 		if (!isItemRemovable())

 		{

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index c86d32c8c4..b65a49eaed 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -356,9 +356,9 @@
          parameter="restore" />
     </menu_item_call>
     <menu_item_call
-     label="Goto Link"
+     label="Find Original"
      layout="topleft"
-     name="Goto Link">
+     name="Find Original">
         <menu_item_call.on_click
          function="Inventory.DoToSelected"
          parameter="goto" />