diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-11 13:43:47 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-11 13:43:47 -0500 |
| commit | e612015500b9f17aab3d3c48f8717d9c0f0ae1ca (patch) | |
| tree | 44073e8c296110b0c9e96704c57e7142a1bbd856 /indra/newview | |
| parent | 99b29fc394b56c69a07eafeedd213ee360ad684c (diff) | |
| parent | 39fe664b97b946daf7984b946fede6f04ae731c4 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 0cceba6cb0..018e9a92a0 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. Inventory type does not match wearable flag bitfield." << LL_ENDL; + continue; + } items_by_type[type].push_back(item); } diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 09d86720f2..95ce6d6ff4 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -57,7 +57,7 @@ label="My Inventory" layout="topleft" name="Inventory" - shortcut="control|shift|I"> + shortcut="control|I"> <menu_item_check.on_check function="SidetrayPanelVisible" parameter="sidepanel_inventory" /> |