diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-27 10:24:53 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-27 10:24:53 -0400 |
| commit | a3328658725dd12efbb1a9107e4c6f0612772c12 (patch) | |
| tree | cc9707083f3cef32a92a481ffbae5b0a7ef92630 /indra/newview/llinventoryicon.cpp | |
| parent | 34ab18d0c2f7de57e42ded0c3d94ee0fec17da28 (diff) | |
| parent | d55264bf13520fc7adab347565ee13cc30fc8656 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 3090371a73..2201481df3 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -117,6 +117,7 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, if (item_is_multi) { idx = ICONNAME_OBJECT_MULTI; + return getIconName(idx); } switch(asset_type) |