Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring.

Browse Source 
-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:
Shyotl
2011-10-03 15:00:43 -05:00
parent 74dc875a27
commit cd86b3a69b
42 changed files with 1344 additions and 1290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llinventorybackup.cpp
View File

@@ -166,7 +166,7 @@ bool LLInventoryBackup::itemIsFolder(LLInventoryItem* item)
ESaveFilter LLInventoryBackup::getSaveFilter(LLInventoryItem* item)
{
LLAssetType::EType type = item->getType();
EWearableType wear = (EWearableType)(item->getFlags() & 0xFF);
LLWearableType::EType wear = (LLWearableType::EType)(item->getFlags() & 0xFF);
switch(type)
{
case LLAssetType::AT_TEXTURE:
@@ -188,33 +188,33 @@ ESaveFilter LLInventoryBackup::getSaveFilter(LLInventoryItem* item)
case LLAssetType::AT_CLOTHING:
switch(wear)
{
case WT_EYES:
case LLWearableType::WT_EYES:
return FFSAVE_EYES;
case WT_GLOVES:
case LLWearableType::WT_GLOVES:
return FFSAVE_GLOVES;
case WT_HAIR:
case LLWearableType::WT_HAIR:
return FFSAVE_HAIR;
case WT_JACKET:
case LLWearableType::WT_JACKET:
return FFSAVE_JACKET;
case WT_PANTS:
case LLWearableType::WT_PANTS:
return FFSAVE_PANTS;
case WT_SHAPE:
case LLWearableType::WT_SHAPE:
return FFSAVE_SHAPE;
case WT_SHIRT:
case LLWearableType::WT_SHIRT:
return FFSAVE_SHIRT;
case WT_SHOES:
case LLWearableType::WT_SHOES:
return FFSAVE_SHOES;
case WT_SKIN:
case LLWearableType::WT_SKIN:
return FFSAVE_SKIN;
case WT_SKIRT:
case LLWearableType::WT_SKIRT:
return FFSAVE_SKIRT;
case WT_SOCKS:
case LLWearableType::WT_SOCKS:
return FFSAVE_SOCKS;
case WT_UNDERPANTS:
case LLWearableType::WT_UNDERPANTS:
return FFSAVE_UNDERPANTS;
case WT_UNDERSHIRT:
case LLWearableType::WT_UNDERSHIRT:
return FFSAVE_UNDERSHIRT;
case WT_PHYSICS:
case LLWearableType::WT_PHYSICS:
return FFSAVE_PHYSICS;
default:
return FFSAVE_ALL;
@@ -228,7 +228,7 @@ ESaveFilter LLInventoryBackup::getSaveFilter(LLInventoryItem* item)
std::string LLInventoryBackup::getExtension(LLInventoryItem* item)
{
LLAssetType::EType type = item->getType();
EWearableType wear = (EWearableType)(item->getFlags() & 0xFF);
LLWearableType::EType wear = (LLWearableType::EType)(item->getFlags() & 0xFF);
std::string scratch;
switch(type)
{
@@ -249,7 +249,7 @@ std::string LLInventoryBackup::getExtension(LLInventoryItem* item)
return ".landmark";
case LLAssetType::AT_BODYPART:
case LLAssetType::AT_CLOTHING:
scratch = LLWearable::typeToTypeName(wear);
scratch = LLWearableType::getTypeName(wear);
if(scratch == "invalid")
{
if(type == LLAssetType::AT_BODYPART)