1 files changed, 12 insertions, 4 deletions

diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index 2a7cdf5..373f3f2 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -323,9 +324,16 @@ void LLPanelGroupNotices::setItem(LLPointer<LLInventoryItem> inv_item)
 {
         mInventoryItem = inv_item;
 
+        BOOL item_is_multi = FALSE;
+        if ( inv_item->getFlags() & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS )
+        {
+                item_is_multi = TRUE;
+        };
+
         LLViewerImage* item_icon = get_item_icon(inv_item->getType(),
                                                                                 inv_item->getInventoryType(),
-                                                                                inv_item->getFlags());
+                                                                                inv_item->getFlags(),
+                                                                                item_is_multi );
 
         mCreateInventoryIcon->setImage(item_icon->getID());
         mCreateInventoryIcon->setVisible(TRUE);
@@ -482,7 +490,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
                 {
                         LLUUID icon_id = get_item_icon_uuid(
                                                 (LLAssetType::EType)asset_type,
-                                                LLInventoryType::IT_NONE,FALSE);
+                                                LLInventoryType::IT_NONE,FALSE, FALSE);
                         row["columns"][0]["type"] = "icon";
                         row["columns"][0]["value"] = icon_id;
                 }
@@ -498,7 +506,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
                 row["columns"][3]["column"] = "date";
                 row["columns"][3]["value"] = buffer;
 
-                snprintf(buffer, 30, "%u", timestamp);          /*Flawfinder: ignore*/
+                snprintf(buffer, 30, "%u", timestamp);                  /* Flawfinder: ignore */
                 row["columns"][4]["column"] = "sort";
                 row["columns"][4]["value"] = buffer;
 
@@ -550,7 +558,7 @@ void LLPanelGroupNotices::showNotice(const char* subject,
 
                 LLViewerImage* item_icon = get_item_icon(mInventoryOffer->mType,
                                                                                                 LLInventoryType::IT_TEXTURE,
-                                                                                                0);
+                                                                                                0, FALSE);
 
                 mViewInventoryIcon->setImage(item_icon->getID());
                 mViewInventoryIcon->setVisible(TRUE);