From 368c992298ff2af912405449dc05f1b23e5cc622 Mon Sep 17 00:00:00 2001 From: angela Date: Thu, 11 Feb 2010 23:43:28 +0800 Subject: EXT-5105 Incorrect keyboard shortcut for Inventory in main menu --- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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"> -- cgit v1.2.3 From 71ae50c56b7e5e45df438bc450fead9424e70034 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Thu, 11 Feb 2010 11:06:42 -0500 Subject: EXT-4387 - Possible fix. No repro, but added an extra safety check and warning the only place in the function that it appears that something could go wrong if we have inventory corruption and InventoryType is wearable but the wearable type bitfield is in a broken state. -Reviewed by vir. --- indra/newview/llappearancemgr.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra') 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); } -- cgit v1.2.3 From 39fe664b97b946daf7984b946fede6f04ae731c4 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Thu, 11 Feb 2010 11:09:08 -0500 Subject: Minor clarification edit to a warning comment. --- indra/newview/llappearancemgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index a78dede344..018e9a92a0 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -668,7 +668,7 @@ void LLAppearanceManager::filterWearableItems( 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; + LL_WARNS("Appearance") << "Invalid wearable type. Inventory type does not match wearable flag bitfield." << LL_ENDL; continue; } items_by_type[type].push_back(item); -- cgit v1.2.3