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.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llwearable.h') diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index 43ffa12420..82d388ab7e 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -133,6 +133,10 @@ public: // Something happened that requires the wearable's label to be updated (e.g. worn/unworn). void setLabelUpdated() const; + // the wearable was worn. make sure the name of the wearable object matches the LLViewerInventoryItem, + // not the wearable asset itself. + void refreshName(); + private: typedef std::map te_map_t; typedef std::map visual_param_index_map_t; -- cgit v1.2.3