SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump

1 files changed, 21 insertions, 1 deletions

diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 606e78bd58..cca3b90329 100644..100755
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1065,7 +1065,27 @@ void LLPanelEditWearable::saveChanges(bool force_save_as)
         }
         else
         {
-                gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
+			LLInventoryModel::item_array_t links =
+				LLAppearanceMgr::instance().findCOFItemLinks(mWearablePtr->getItemID());
+			if (links.size()>0)
+			{
+				// Make another copy of this link, with the same description.
+				LLInventoryItem *item = links.get(0).get();
+				if (item)
+				{
+					const std::string description = item->getIsLinkType() ? item->getActualDescription() : "";
+					link_inventory_item( gAgent.getID(),
+										 item->getLinkedUUID(),
+										 LLAppearanceMgr::instance().getCOF(),
+										 item->getName(),
+										 description,
+										 LLAssetType::AT_LINK,
+										 NULL);
+					gInventory.purgeObject(item->getUUID());
+				}
+			}
+			gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
+
         }
 }