Refactoring.
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions. -LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions. -LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines. -LLWearable WearableType conversions yanked. Use LLWearableType. -LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines. -EWearableType now LLWearableType::EType -LLWearable::getID() renamed to LLWearable::getAssetID() VOAvatar cleanup. -Removed redundant TEWearable functions. -Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change. -LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
This commit is contained in:
@@ -368,13 +368,13 @@ bool LLViewerInventoryItem::isWearableType() const
|
||||
return (getInventoryType() == LLInventoryType::IT_WEARABLE);
|
||||
}
|
||||
|
||||
EWearableType LLViewerInventoryItem::getWearableType() const
|
||||
LLWearableType::EType LLViewerInventoryItem::getWearableType() const
|
||||
{
|
||||
if (!isWearableType())
|
||||
{
|
||||
return WT_INVALID;
|
||||
return LLWearableType::WT_INVALID;
|
||||
}
|
||||
return EWearableType(getFlags() & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK);
|
||||
return LLWearableType::EType(getFlags() & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK);
|
||||
}
|
||||
// [/RLVa:KB]
|
||||
|
||||
@@ -755,7 +755,7 @@ void create_inventory_item(const LLUUID& agent_id, const LLUUID& session_id,
|
||||
const LLUUID& parent, const LLTransactionID& transaction_id,
|
||||
const std::string& name,
|
||||
const std::string& desc, LLAssetType::EType asset_type,
|
||||
LLInventoryType::EType inv_type, EWearableType wtype,
|
||||
LLInventoryType::EType inv_type, LLWearableType::EType wtype,
|
||||
U32 next_owner_perm,
|
||||
LLPointer<LLInventoryCallback> cb)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user