diff options
| author | McCabe Maxsted | 2009-01-18 14:58:20 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-01-18 14:58:20 -0700 |
| commit | 14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d (patch) | |
| tree | 7df321866ff9ccc352918e925bf37ab4a4bc8c06 /linden/indra/newview/llgroupnotify.cpp | |
| parent | Removed/moved unnecessary options (diff) | |
| parent | Merge branch 'filter-fixes' into next (diff) | |
| download | meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.zip meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.tar.gz meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.tar.bz2 meta-impy-14676d1d5d042b1b9e4da8aefbba2eaf311e0b9d.tar.xz | |
merged in jacek's fixes for inv icons
Diffstat (limited to 'linden/indra/newview/llgroupnotify.cpp')
| -rw-r--r-- | linden/indra/newview/llgroupnotify.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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; |