diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-05-14 09:11:17 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-05-14 09:11:17 -0700 |
commit | 5fe6a5489ccfea4772f4cd4e3310b98a71ff2bab (patch) | |
tree | 74f791fe0470ae9528b552e87ff572851efab3da /indra/newview/llappearancemgr.cpp | |
parent | c72d3b8bf40d7a6443345a9a53df5e6f7739a4b1 (diff) | |
parent | d9f519d55c4b5cff0fa56d2130a7e25a144be9ff (diff) |
Merged
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r-- | indra/newview/llappearancemgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 80e8b94ccc..bcaba34921 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -179,7 +179,7 @@ struct LLFoundData { LLFoundData() : mAssetType(LLAssetType::AT_NONE), - mWearableType(LLWearableType::WT_NONE), + mWearableType(LLWearableType::WT_INVALID), mWearable(NULL) {} LLFoundData(const LLUUID& item_id, @@ -392,7 +392,7 @@ public: linked_item->getAssetUUID(), linked_item->getName(), linked_item->getType(), - linked_item->isWearableType() ? linked_item->getWearableType() : LLWearableType::WT_NONE + linked_item->isWearableType() ? linked_item->getWearableType() : LLWearableType::WT_INVALID ); found.mWearable = mWearable; mHolder->mFoundList.push_front(found); @@ -1115,7 +1115,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF() linked_item->getAssetUUID(), linked_item->getName(), linked_item->getType(), - linked_item->isWearableType() ? linked_item->getWearableType() : LLWearableType::WT_NONE + linked_item->isWearableType() ? linked_item->getWearableType() : LLWearableType::WT_INVALID ); #if 0 |