diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 15:57:01 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 15:57:01 -0700 |
| commit | 4f6e814eaa7ae5cfc10e4e7d1f22e53be395a2f4 (patch) | |
| tree | be554f9f22996e00dada6da67f7e77eb0502b0f5 /indra/newview/llinventoryicon.cpp | |
| parent | f423a69864c40f760c1c7e64a2e544fd1dba77fb (diff) | |
| parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) | |
Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 2201481df3..3090371a73 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -117,7 +117,6 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, if (item_is_multi) { idx = ICONNAME_OBJECT_MULTI; - return getIconName(idx); } switch(asset_type) |