From e380956210e59e8fac837582afbceed09476ec96 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 16 Jan 2009 20:00:15 -0600 Subject: Fixed group notice popup showing wrong item type. Attachment was showing texture icon regardless of type. --- ChangeLog.txt | 5 +++++ linden/indra/newview/llgroupnotify.cpp | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 09df22e..f5a4b4e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2009-01-16 Jacek Antonelli + * linden/indra/newview/llgroupnotify.cpp: + Fixed group notice popup showing wrong item type. + Attachment was showing texture icon regardless of type. + + * linden/indra/newview/llfloateravatarpicker.cpp: Fixed Resident chooser not showing calling cards. diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp index 3f8ff3d..eafa06c 100644 --- a/linden/indra/newview/llgroupnotify.cpp +++ b/linden/indra/newview/llgroupnotify.cpp @@ -248,9 +248,13 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject, { addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::sSansSerif)); - LLUIImagePtr item_icon = get_item_icon(mInventoryOffer->mType, - LLInventoryType::IT_TEXTURE, - 0, FALSE); + + LLAssetType::EType atype; + LLInventoryType::EType itype; + atype = mInventoryOffer->mType; + itype = LLInventoryType::defaultForAssetType( atype ); + + LLUIImagePtr item_icon = get_item_icon(atype, itype, 0, FALSE); x += LABEL_WIDTH + HPAD; -- cgit v1.1