aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventorybridge.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/llinventorybridge.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 '')
-rw-r--r--linden/indra/newview/llinventorybridge.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 42af09a..1f24d14 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -144,6 +144,8 @@ std::string ICON_NAME[ICON_NAME_COUNT] =
144 "inv_item_undershirt.tga", 144 "inv_item_undershirt.tga",
145 "inv_item_underpants.tga", 145 "inv_item_underpants.tga",
146 "inv_item_skirt.tga", 146 "inv_item_skirt.tga",
147 "inv_item_alpha.tga",
148 "inv_item_tattoo.tga",
147 149
148 "inv_item_animation.tga", 150 "inv_item_animation.tga",
149 "inv_item_gesture.tga", 151 "inv_item_gesture.tga",
@@ -2208,6 +2210,16 @@ void LLFolderBridge::createNewUnderpants(void* user_data)
2208 LLFolderBridge::createWearable((LLFolderBridge*)user_data, WT_UNDERPANTS); 2210 LLFolderBridge::createWearable((LLFolderBridge*)user_data, WT_UNDERPANTS);
2209} 2211}
2210 2212
2213void LLFolderBridge::createNewAlpha(void* user_data)
2214{
2215 LLFolderBridge::createWearable((LLFolderBridge*)user_data, WT_ALPHA);
2216}
2217
2218void LLFolderBridge::createNewTattoo(void* user_data)
2219{
2220 LLFolderBridge::createWearable((LLFolderBridge*)user_data, WT_TATTOO);
2221}
2222
2211void LLFolderBridge::createNewShape(void* user_data) 2223void LLFolderBridge::createNewShape(void* user_data)
2212{ 2224{
2213 LLFolderBridge::createWearable((LLFolderBridge*)user_data, WT_SHAPE); 2225 LLFolderBridge::createWearable((LLFolderBridge*)user_data, WT_SHAPE);