diff options
author | Robert Adams | 2013-12-05 21:07:44 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-05 21:07:44 -0800 |
commit | 4eb52eb19e2bd18ad5dc56a06600fa966f3190a3 (patch) | |
tree | 4c6428c00023c4668ef516d1e44ee576fabb3721 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
parent | Merge branch 'master' into varregion (diff) | |
parent | Adding profile partners fix to SQLite and PgSQL drivers (diff) | |
download | opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.zip opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.gz opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.bz2 opensim-SC_OLD-4eb52eb19e2bd18ad5dc56a06600fa966f3190a3.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 1d4c7f0..a4fe81c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -498,24 +498,28 @@ namespace OpenSim.Region.ClientStack.Linden | |||
498 | 498 | ||
499 | if (inventoryType == "sound") | 499 | if (inventoryType == "sound") |
500 | { | 500 | { |
501 | inType = 1; | 501 | inType = (sbyte)InventoryType.Sound; |
502 | assType = 1; | 502 | assType = (sbyte)AssetType.Sound; |
503 | } | ||
504 | else if (inventoryType == "snapshot") | ||
505 | { | ||
506 | inType = (sbyte)InventoryType.Snapshot; | ||
503 | } | 507 | } |
504 | else if (inventoryType == "animation") | 508 | else if (inventoryType == "animation") |
505 | { | 509 | { |
506 | inType = 19; | 510 | inType = (sbyte)InventoryType.Animation; |
507 | assType = 20; | 511 | assType = (sbyte)AssetType.Animation; |
508 | } | 512 | } |
509 | else if (inventoryType == "wearable") | 513 | else if (inventoryType == "wearable") |
510 | { | 514 | { |
511 | inType = 18; | 515 | inType = (sbyte)InventoryType.Wearable; |
512 | switch (assetType) | 516 | switch (assetType) |
513 | { | 517 | { |
514 | case "bodypart": | 518 | case "bodypart": |
515 | assType = 13; | 519 | assType = (sbyte)AssetType.Bodypart; |
516 | break; | 520 | break; |
517 | case "clothing": | 521 | case "clothing": |
518 | assType = 5; | 522 | assType = (sbyte)AssetType.Clothing; |
519 | break; | 523 | break; |
520 | } | 524 | } |
521 | } | 525 | } |