diff options
author | Armin Weatherwax | 2010-03-09 23:00:38 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-06-19 02:43:01 -0500 |
commit | 523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6 (patch) | |
tree | efc2b1bf0b7ca57b4fcc5e64da555907437a408d /linden/indra/newview/llinventoryactions.cpp | |
parent | Applied patch by Kirstenlee Cinquetti for SNOW-493: LLDataPackerBinaryBuffer:... (diff) | |
download | meta-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/llinventoryactions.cpp')
-rw-r--r-- | linden/indra/newview/llinventoryactions.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp index d7af8d1..319b5b2 100644 --- a/linden/indra/newview/llinventoryactions.cpp +++ b/linden/indra/newview/llinventoryactions.cpp | |||
@@ -428,6 +428,16 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, std::string type, | |||
428 | LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(LLAssetType::AT_CLOTHING); | 428 | LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(LLAssetType::AT_CLOTHING); |
429 | LLFolderBridge::createWearable(parent_id, WT_UNDERPANTS); | 429 | LLFolderBridge::createWearable(parent_id, WT_UNDERPANTS); |
430 | } | 430 | } |
431 | else if ("alpha" == type) | ||
432 | { | ||
433 | LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(LLAssetType::AT_CLOTHING); | ||
434 | LLFolderBridge::createWearable(parent_id, WT_ALPHA); | ||
435 | } | ||
436 | else if ("tattoo" == type) | ||
437 | { | ||
438 | LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(LLAssetType::AT_CLOTHING); | ||
439 | LLFolderBridge::createWearable(parent_id, WT_TATTOO); | ||
440 | } | ||
431 | else if ("shape" == type) | 441 | else if ("shape" == type) |
432 | { | 442 | { |
433 | LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(LLAssetType::AT_BODYPART); | 443 | LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(LLAssetType::AT_BODYPART); |