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

[BOM] Fix universal wearables more, and correctly: Sync WT_COUNT and WT_UNKNOWN constants in llinventory.cpp and llwearable.h

Browse Source 
Reverted previous changes to textures.xml regarding this issue
This commit is contained in:
Router Gray
2019-12-17 06:34:27 -06:00
parent cf5586037e
commit f25577649a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llappearance/llwearabletype.h
View File

@@ -58,6 +58,7 @@ public:
WT_UNKNOWN = 17, // Singu note: used for corrupt wearables that do not have their type set in the inventory database.
// While all the above values are serialized and stored in the database, this value is local only:
// When a new item with value 17 is added by upstream, just increase this value to 18 (and WT_COUNT to 19).
// Keep WT_UNKNOWN and WT_COUNT in sync with llinventory.cpp
WT_COUNT = 18,
WT_INVALID = 255,

6
indra/llinventory/llinventory.cpp
View File

@@ -1165,8 +1165,10 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
// mType, these are the two asset types that are IT_WEARABLE:
static U32 AT_BODYPART = 13; // LLAssetType::AT_BODYPART
// Viewer local values:
static U32 WT_UNKNOWN = 16; // LLWearableType::WT_UNKNOWN
static U32 WT_COUNT = 17; // LLWearableType::WT_COUNT
static U32 WT_UNKNOWN = 17; // LLWearableType::WT_UNKNOWN
static U32 WT_COUNT = 18; // LLWearableType::WT_COUNT
// Keep WT_UNKNOWN and WT_COUNT
// in sync with llwearabletype.h
// The last 8 bits of mFlags contain the wearable type.
static U32 II_FLAGS_SUBTYPE_MASK = 0xff; // LLInventoryItemFlags::II_FLAGS_SUBTYPE_MASK

2
indra/newview/skins/default/textures/textures.xml
View File

@@ -355,7 +355,7 @@ with the same filename but different name
<texture name="inv_item_socks.tga"/>
<texture name="inv_item_sound.tga"/>
<texture name="inv_item_tattoo.tga"/>
<texture name="Inv_Universal.png"/>
<texture name="Inv_Universal" file_name="Inv_Universal.png" preload="false" />
<texture name="inv_item_texture.tga"/>
<texture name="inv_item_underpants.tga"/>
<texture name="inv_item_undershirt.tga"/>