diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-07-26 16:58:40 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-07-26 16:58:40 +0300 |
| commit | 3b88ba4351db725619348c274b982a5a9b7b4d11 (patch) | |
| tree | e119d8b1af19dac857b30788c05e82703c318c50 /indra/newview/llinventoryicon.cpp | |
| parent | 5224e3d217cfb43670a88063b612e92d217a65aa (diff) | |
EXT-2707 FIXED Fixed incorrectness of coalesced objects icons in inventory.
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result.
- Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/
--HG--
branch : product-engine
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) |