diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterbuy.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp index 2266845..be52084 100644 --- a/linden/indra/newview/llfloaterbuy.cpp +++ b/linden/indra/newview/llfloaterbuy.cpp | |||
@@ -5,6 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (c) 2004-2007, Linden Research, Inc. | 6 | * Copyright (c) 2004-2007, Linden Research, Inc. |
7 | * | 7 | * |
8 | * Second Life Viewer Source Code | ||
8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -147,7 +148,8 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info) | |||
147 | // Compute icon for this item | 148 | // Compute icon for this item |
148 | LLUUID icon_id = get_item_icon_uuid(LLAssetType::AT_OBJECT, | 149 | LLUUID icon_id = get_item_icon_uuid(LLAssetType::AT_OBJECT, |
149 | LLInventoryType::IT_OBJECT, | 150 | LLInventoryType::IT_OBJECT, |
150 | 0x0); | 151 | 0x0, FALSE); |
152 | |||
151 | row["columns"][0]["column"] = "icon"; | 153 | row["columns"][0]["column"] = "icon"; |
152 | row["columns"][0]["type"] = "icon"; | 154 | row["columns"][0]["type"] = "icon"; |
153 | row["columns"][0]["value"] = icon_id; | 155 | row["columns"][0]["value"] = icon_id; |
@@ -243,9 +245,16 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj, | |||
243 | LLSD row; | 245 | LLSD row; |
244 | 246 | ||
245 | // Compute icon for this item | 247 | // Compute icon for this item |
248 | BOOL item_is_multi = FALSE; | ||
249 | if ( inv_item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED ) | ||
250 | { | ||
251 | item_is_multi = TRUE; | ||
252 | } | ||
253 | |||
246 | LLUUID icon_id = get_item_icon_uuid(inv_item->getType(), | 254 | LLUUID icon_id = get_item_icon_uuid(inv_item->getType(), |
247 | inv_item->getInventoryType(), | 255 | inv_item->getInventoryType(), |
248 | inv_item->getFlags()); | 256 | inv_item->getFlags(), |
257 | item_is_multi); | ||
249 | row["columns"][0]["column"] = "icon"; | 258 | row["columns"][0]["column"] = "icon"; |
250 | row["columns"][0]["type"] = "icon"; | 259 | row["columns"][0]["type"] = "icon"; |
251 | row["columns"][0]["value"] = icon_id; | 260 | row["columns"][0]["value"] = icon_id; |