summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2010-02-11 11:08:06 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2010-02-11 11:08:06 -0500
commite3f75c2c250a86cdc687c78c11fa7ddb3f4bcf86 (patch)
tree691fee2c7f6888cd2a85e5ecd15531e544b22cc8 /indra/newview
parent368c992298ff2af912405449dc05f1b23e5cc622 (diff)
parent71ae50c56b7e5e45df438bc450fead9424e70034 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappearancemgr.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 0cceba6cb0..a78dede344 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -666,6 +666,11 @@ void LLAppearanceManager::filterWearableItems(
if (!item->isWearableType())
continue;
EWearableType type = item->getWearableType();
+ if(type < 0 || type >= WT_COUNT)
+ {
+ LL_WARNS("Appearance") << "Invalid wearable type. Type does not match wearable flag bitfield." << LL_ENDL;
+ continue;
+ }
items_by_type[type].push_back(item);
}