diff options
author | UbitUmarov | 2014-09-25 14:10:44 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-25 14:10:44 +0100 |
commit | f51779bb05b29558e3908ad9931ed61ddc61f390 (patch) | |
tree | da0d061fd84a6ef838eb809159632876f6d93802 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |
parent | add animationset to upload assets, for now no cost (diff) | |
download | opensim-SC-f51779bb05b29558e3908ad9931ed61ddc61f390.zip opensim-SC-f51779bb05b29558e3908ad9931ed61ddc61f390.tar.gz opensim-SC-f51779bb05b29558e3908ad9931ed61ddc61f390.tar.bz2 opensim-SC-f51779bb05b29558e3908ad9931ed61ddc61f390.tar.xz |
add also the name animset until its clear the name liru will use
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 593bd52..01d4248 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -757,12 +757,19 @@ 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 | // add add both animationset and animset until is clear what name Liru will use | ||
760 | else if (inventoryType == "animationset") | 761 | else if (inventoryType == "animationset") |
761 | { | 762 | { |
762 | inType = (sbyte)CustomInventoryType.AnimationSet; | 763 | inType = (sbyte)CustomInventoryType.AnimationSet; |
763 | assType = (sbyte)CustomAssetType.AnimationSet; | 764 | assType = (sbyte)CustomAssetType.AnimationSet; |
764 | m_log.Debug("got animationset upload request"); | 765 | m_log.Debug("got animationset upload request"); |
765 | } | 766 | } |
767 | else if (inventoryType == "animset") | ||
768 | { | ||
769 | inType = (sbyte)CustomInventoryType.AnimationSet; | ||
770 | assType = (sbyte)CustomAssetType.AnimationSet; | ||
771 | m_log.Debug("got animset upload request"); | ||
772 | } | ||
766 | else if (inventoryType == "wearable") | 773 | else if (inventoryType == "wearable") |
767 | { | 774 | { |
768 | inType = (sbyte)InventoryType.Wearable; | 775 | inType = (sbyte)InventoryType.Wearable; |