diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-27 10:46:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-27 10:46:53 +0100 |
| commit | e8114d77352934103011249ad5413ab1bb94ea19 (patch) | |
| tree | 00946ca3c53f61befcd5d25c1c8aab3c3e68cf93 /indra/newview/llinventoryicon.cpp | |
| parent | 4cd3844f05825e6782920141632fbc7c72087347 (diff) | |
| parent | e1effcb285c8072601e5148101293e6702128fdd (diff) | |
slightly-hairy merge from viewer-release
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) |