From 5be77f8e8cdec5fa1bd16568875dc6c9ac94d96e Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 28 Jul 2010 12:33:34 +0300 Subject: EXT-2707 ADDITIONAL FIX Fixed wrong icon showing for coalesced objects in "Add More" panel. Problem was caused by getting item's icon always with FALSE value of item_is_multi argument in LLPanelInventoryListItemBase::postBuild(). - Used II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS flag to determine whether item is multiobject and getting appropriate icon. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/812/ --HG-- branch : product-engine --- indra/newview/llinventorylistitem.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index 2546390fcb..c2ee5c8c8b 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -44,6 +44,7 @@ // newview #include "llinventorymodel.h" #include "llviewerinventory.h" +#include "llinventorydefines.h" static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelInventoryListItemBaseParams(&typeid(LLPanelInventoryListItemBase::Params), "inventory_list_item"); @@ -166,7 +167,7 @@ BOOL LLPanelInventoryListItemBase::postBuild() LLViewerInventoryItem* inv_item = getItem(); if (inv_item) { - mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), FALSE); + mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & inv_item->getFlags()); updateItem(inv_item->getName()); } -- cgit v1.2.3 From cf286ad9631ed0cfa7a134fad0f580fed5e34dc6 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 28 Jul 2010 19:27:10 +0300 Subject: EXT-8310 REFIXED Localized currency format in the Buy Land floater. I'm actually restoring a part of the fix that was previosly committed in 75a1d14d6cc5 and then somewhy reverted in 0d364d4ddd91. Trivial change, not reviewed. --HG-- branch : product-engine --- indra/newview/skins/default/xui/fr/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 0a269016f5..7ef67d5912 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -3859,4 +3859,5 @@ de l'infraction signalée PM + [AMOUNT] US$ -- cgit v1.2.3 From 3d14fe23fcf7f05cb207c34fdfb13c54c668eba1 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Wed, 28 Jul 2010 19:49:09 +0300 Subject: EXT-8361 REFIXED Tooltips in Nearby Media window in the French viewer. Restored a part of my fix that was somewhy reverted by Eli in rev. 0d364d4ddd91. --HG-- branch : product-engine --- indra/newview/skins/default/xui/da/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/de/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/es/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/fr/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/it/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/ja/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/pl/panel_nearby_media.xml | 2 +- indra/newview/skins/default/xui/pt/panel_nearby_media.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml index 7d25b2af99..a269e35f4b 100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml @@ -42,7 +42,7 @@ - +