diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 762e22a..613bc24 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -743,6 +743,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
743 | inType = (sbyte)InventoryType.Sound; | 743 | inType = (sbyte)InventoryType.Sound; |
744 | assType = (sbyte)AssetType.Sound; | 744 | assType = (sbyte)AssetType.Sound; |
745 | } | 745 | } |
746 | else if (inventoryType == "snapshot") | ||
747 | { | ||
748 | inType = (sbyte)InventoryType.Snapshot; | ||
749 | } | ||
746 | else if (inventoryType == "animation") | 750 | else if (inventoryType == "animation") |
747 | { | 751 | { |
748 | inType = (sbyte)InventoryType.Animation; | 752 | inType = (sbyte)InventoryType.Animation; |