aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-16 20:00:15 -0600
committerJacek Antonelli2009-01-17 16:51:18 -0600
commite380956210e59e8fac837582afbceed09476ec96 (patch)
tree296525e3808922cdd2344e64b6e20ca590e55c13
parentFixed Resident chooser not showing calling cards. (diff)
downloadmeta-impy-e380956210e59e8fac837582afbceed09476ec96.zip
meta-impy-e380956210e59e8fac837582afbceed09476ec96.tar.gz
meta-impy-e380956210e59e8fac837582afbceed09476ec96.tar.bz2
meta-impy-e380956210e59e8fac837582afbceed09476ec96.tar.xz
Fixed group notice popup showing wrong item type.
Attachment was showing texture icon regardless of type.
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llgroupnotify.cpp10
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 @@
12009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-01-16 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llgroupnotify.cpp:
4 Fixed group notice popup showing wrong item type.
5 Attachment was showing texture icon regardless of type.
6
7
3 * linden/indra/newview/llfloateravatarpicker.cpp: 8 * linden/indra/newview/llfloateravatarpicker.cpp:
4 Fixed Resident chooser not showing calling cards. 9 Fixed Resident chooser not showing calling cards.
5 10
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,
248 { 248 {
249 addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::sSansSerif)); 249 addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::sSansSerif));
250 250
251 LLUIImagePtr item_icon = get_item_icon(mInventoryOffer->mType, 251
252 LLInventoryType::IT_TEXTURE, 252 LLAssetType::EType atype;
253 0, FALSE); 253 LLInventoryType::EType itype;
254 atype = mInventoryOffer->mType;
255 itype = LLInventoryType::defaultForAssetType( atype );
256
257 LLUIImagePtr item_icon = get_item_icon(atype, itype, 0, FALSE);
254 258
255 259
256 x += LABEL_WIDTH + HPAD; 260 x += LABEL_WIDTH + HPAD;