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

RLVA fix. LLWearableType::typeNameToType now returns LLWearableType::WT_NONE, not LLWearableType::WT_INVALID

Browse Source
This commit is contained in:
Shyotl
2011-10-03 23:30:07 -05:00
parent 30a95e7f45
commit 6841b0cf47
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llinventoryactions.cpp
View File

@@ -393,7 +393,7 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, std::string type,
else else
{ {
LLWearableType::EType wear_type = LLWearableType::typeNameToType(type); LLWearableType::EType wear_type = LLWearableType::typeNameToType(type);
if(wear_type != LLWearableType::WT_INVALID) if(wear_type != LLWearableType::WT_NONE)
{ {
LLFolderType::EType folder_type = LLFolderType::assetTypeToFolderType(LLWearableType::getAssetType(wear_type)); LLFolderType::EType folder_type = LLFolderType::assetTypeToFolderType(LLWearableType::getAssetType(wear_type));
LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(folder_type); LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(folder_type);

8
indra/newview/rlvhandler.cpp
View File

@@ -739,7 +739,7 @@ bool RlvHandler::redirectChatOrEmote(const std::string& strUTF8Text) const
if ( (getCompositeInfo(idItem, &strComposite, &pFolder)) && (cstrItemType != strComposite) ) if ( (getCompositeInfo(idItem, &strComposite, &pFolder)) && (cstrItemType != strComposite) )
{ {
LLUUID idCompositeItem; LLUUID idCompositeItem;
if ((type = LLWearable::typeNameToType(strComposite)) != LLWearableType::WT_INVALID) if ((type = LLWearable::typeNameToType(strComposite)) != LLWearableType::WT_NONE)
{ {
idCompositeItem = gAgentWearables.getWearableItemID(type); idCompositeItem = gAgentWearables.getWearableItemID(type);
} }
@@ -1989,7 +1989,7 @@ ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strRep
// (Compatibility: RLV-1.16.1 will execute @getoutfit=<channel> if <layer> is invalid while we just return failure) // (Compatibility: RLV-1.16.1 will execute @getoutfit=<channel> if <layer> is invalid while we just return failure)
LLWearableType::EType wtType = LLWearableType::typeNameToType(rlvCmd.getOption()); LLWearableType::EType wtType = LLWearableType::typeNameToType(rlvCmd.getOption());
if ( (LLWearableType::WT_INVALID == wtType) && (!rlvCmd.getOption().empty()) ) if ( (LLWearableType::WT_NONE == wtType) && (!rlvCmd.getOption().empty()) )
return RLV_RET_FAILED_OPTION; return RLV_RET_FAILED_OPTION;
const LLWearableType::EType wtRlvTypes[] = const LLWearableType::EType wtRlvTypes[] =
@@ -1998,9 +1998,9 @@ ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strRep
LLWearableType::WT_UNDERPANTS, LLWearableType::WT_UNDERSHIRT, LLWearableType::WT_SKIN, LLWearableType::WT_EYES, LLWearableType::WT_HAIR, LLWearableType::WT_SHAPE, LLWearableType::WT_ALPHA, LLWearableType::WT_TATTOO, LLWearableType::WT_PHYSICS LLWearableType::WT_UNDERPANTS, LLWearableType::WT_UNDERSHIRT, LLWearableType::WT_SKIN, LLWearableType::WT_EYES, LLWearableType::WT_HAIR, LLWearableType::WT_SHAPE, LLWearableType::WT_ALPHA, LLWearableType::WT_TATTOO, LLWearableType::WT_PHYSICS
}; };
for (int idxType = 0, cntType = sizeof(wtRlvTypes) / sizeof(LLWearableType::EType); idxType < cntType; idxType++) for (int idxType = 0; idxType < sizeof(wtRlvTypes) / sizeof(wtRlvTypes[0]); ++idxType)
{ {
if ( (LLWearableType::WT_INVALID == wtType) || (wtRlvTypes[idxType] == wtType) ) if ( (LLWearableType::WT_NONE == wtType) || (wtRlvTypes[idxType] == wtType) )
{ {
// We never hide body parts, even if they're "locked" and we're hiding locked layers // We never hide body parts, even if they're "locked" and we're hiding locked layers
// (nor do we hide a layer if the issuing object is the only one that has this layer locked) // (nor do we hide a layer if the issuing object is the only one that has this layer locked)

2
indra/newview/rlvhelper.cpp
View File

@@ -188,7 +188,7 @@ RlvCommandOptionGeneric::RlvCommandOptionGeneric(const std::string& strOption)
if (!(m_fEmpty = strOption.empty())) // <option> could be an empty string if (!(m_fEmpty = strOption.empty())) // <option> could be an empty string
{ {
if ((wtType = LLWearableType::typeNameToType(strOption)) != LLWearableType::WT_INVALID) if ((wtType = LLWearableType::typeNameToType(strOption)) != LLWearableType::WT_NONE)
m_varOption = wtType; // ... or specify a clothing layer m_varOption = wtType; // ... or specify a clothing layer
else if ((pAttachPt = RlvAttachPtLookup::getAttachPoint(strOption)) != NULL) else if ((pAttachPt = RlvAttachPtLookup::getAttachPoint(strOption)) != NULL)
m_varOption = pAttachPt; // ... or specify an attachment point m_varOption = pAttachPt; // ... or specify an attachment point