diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:30:59 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-30 15:30:59 -0400 |
| commit | 6d82b0c0a2b470452b86332f3b51d7d720bc7341 (patch) | |
| tree | ae8b122c479a9e6b7b6feffa7585ae1fb123ec3d | |
| parent | cc3f4c1f59f38a6a5caead4cbd53ddc4d94217ef (diff) | |
EXT-6633 enable demo of multiwearables code
cleaning up a merge conflict where HG didn't quite do the right thing.
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index e1ecdbc3c4..aa8f8c22b1 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1629,18 +1629,10 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it if (new_wearable) { const EWearableType type = new_wearable->getType(); - // Special case where you're putting on a wearable that has the same assetID - // as the previous (e.g. wear a shirt then wear a copy of that shirt) since in this - // case old_wearable == new_wearable. - if (old_wearable == new_wearable) - { - old_wearable->setLabelUpdated(); - new_wearable->setName(new_item->getName()); - new_wearable->setItemID(new_item->getUUID()); - } - - + + new_wearable->setName(new_item->getName()); new_wearable->setItemID(new_item->getUUID()); + if (LLWearableDictionary::getAssetType(type) == LLAssetType::AT_BODYPART) { // exactly one wearable per body part |