aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2014-09-25 13:35:30 +0100
committerUbitUmarov2014-09-25 13:35:30 +0100
commit18cc33e2c55539596363a0233bc680034bfacef6 (patch)
tree3f3e191a3f25d9cdd4dd97282cd5aa4631bbf169 /OpenSim/Region
parentMerge branch 'ubitworkmaster' (diff)
downloadopensim-SC_OLD-18cc33e2c55539596363a0233bc680034bfacef6.zip
opensim-SC_OLD-18cc33e2c55539596363a0233bc680034bfacef6.tar.gz
opensim-SC_OLD-18cc33e2c55539596363a0233bc680034bfacef6.tar.bz2
opensim-SC_OLD-18cc33e2c55539596363a0233bc680034bfacef6.tar.xz
add animationset to upload assets, for now no cost
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 61b9045..593bd52 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -757,6 +757,12 @@ namespace OpenSim.Region.ClientStack.Linden
757 inType = (sbyte)InventoryType.Animation; 757 inType = (sbyte)InventoryType.Animation;
758 assType = (sbyte)AssetType.Animation; 758 assType = (sbyte)AssetType.Animation;
759 } 759 }
760 else if (inventoryType == "animationset")
761 {
762 inType = (sbyte)CustomInventoryType.AnimationSet;
763 assType = (sbyte)CustomAssetType.AnimationSet;
764 m_log.Debug("got animationset upload request");
765 }
760 else if (inventoryType == "wearable") 766 else if (inventoryType == "wearable")
761 { 767 {
762 inType = (sbyte)InventoryType.Wearable; 768 inType = (sbyte)InventoryType.Wearable;