aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventoryview.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-09 23:00:38 +0100
committerJacek Antonelli2010-06-19 02:43:01 -0500
commit523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6 (patch)
treeefc2b1bf0b7ca57b4fcc5e64da555907437a408d /linden/indra/newview/llinventoryview.cpp
parentApplied patch by Kirstenlee Cinquetti for SNOW-493: LLDataPackerBinaryBuffer:... (diff)
downloadmeta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.zip
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.gz
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.bz2
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.xz
Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers (v6)
slviewer-0-v12350-AlphaAndTattooSupport-patch.zip contains the necessary avatar_lad.xml and other artwork. The new avatar_lad.xml crashes clients without alpha and tattoo support at startup.
Diffstat (limited to 'linden/indra/newview/llinventoryview.cpp')
-rw-r--r--linden/indra/newview/llinventoryview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index aee67b4..7be1542 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1485,6 +1485,12 @@ std::string get_item_icon_name(LLInventoryType::NType inv_ntype,
1485 case LLInventoryType::NIT_SKIRT: 1485 case LLInventoryType::NIT_SKIRT:
1486 idx = CLOTHING_SKIRT_ICON_NAME; 1486 idx = CLOTHING_SKIRT_ICON_NAME;
1487 break; 1487 break;
1488 case LLInventoryType::NIT_ALPHA:
1489 idx = CLOTHING_ALPHA_ICON_NAME;
1490 break;
1491 case LLInventoryType::NIT_TATTOO:
1492 idx = CLOTHING_TATTOO_ICON_NAME;
1493 break;
1488 1494
1489 case LLInventoryType::NIT_CLOTHING: 1495 case LLInventoryType::NIT_CLOTHING:
1490 idx = CLOTHING_ICON_NAME; 1496 idx = CLOTHING_ICON_NAME;