From 5642d7d0122da91d8ef23f8adb069cc82e0c4ed4 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 1 Dec 2009 19:21:39 -0500 Subject: EXT-2749 Appearance editor still uses the name for items that have been renamed. The name stored in an LLWearable object is not always in sync with the LLInventoryItem name. Since we reference these by asset id, which does not change when you rename something (only the LLInventoryItem changes). Fixed by refreshing the name from the LLInventoryItem every time we wear the object. If we are already wearing the object, the wearable's name is already explicitly updated. Code reviewed by Bigpapi --HG-- branch : avatar-pipeline --- indra/newview/llwearable.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/llwearable.cpp') diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 3cb0ec4bad..0405b9d28b 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -1094,6 +1094,16 @@ void LLWearable::setLabelUpdated() const gInventory.addChangedMask(LLInventoryObserver::LABEL, getItemID()); } +void LLWearable::refreshName() +{ + LLUUID item_id = getItemID(); + LLInventoryItem* item = gInventory.getItem(item_id); + if( item ) + { + mName = item->getName(); + } +} + struct LLWearableSaveData { EWearableType mType; -- cgit v1.2.3