diff options
author | Homer Horwitz | 2009-05-09 21:11:12 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-05-09 21:11:12 +0000 |
commit | 1d234ca83f64b31b559ace3f63ebbba9f4903778 (patch) | |
tree | 887ba461d3ff20432806672786cbb82ff39b9aa4 | |
parent | * Code to make MRM debugging easier. (diff) | |
download | opensim-SC-1d234ca83f64b31b559ace3f63ebbba9f4903778.zip opensim-SC-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.gz opensim-SC-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.bz2 opensim-SC-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.xz |
Fixed handling of inventory a bit
- AssetType isn't InventoryType. Those enums contain different numbers. Use AssetType for the asset type, InventoryType for the inventory type.
- The ToString method (or ToLower) of AssetType/InventoryType doesn't necessarily return the correct LLSD string.
- Replaced several magic numbers by their corresponding enum.
- Fixed the invType for gestures and animations in the library.
This should fix Mantis #3610 and the non-terminating inventory loading
Diffstat (limited to '')
7 files changed, 57 insertions, 49 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index ae242bd..5de44b6 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -2045,7 +2045,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2045 | // good as having type be specified in the XML. | 2045 | // good as having type be specified in the XML. |
2046 | 2046 | ||
2047 | if (ic.Item.AssetType == (int) AssetType.Unknown || | 2047 | if (ic.Item.AssetType == (int) AssetType.Unknown || |
2048 | ic.Item.InvType == (int) AssetType.Unknown) | 2048 | ic.Item.InvType == (int) InventoryType.Unknown) |
2049 | { | 2049 | { |
2050 | Rest.Log.DebugFormat("{0} Attempting to infer item type", MsgId); | 2050 | Rest.Log.DebugFormat("{0} Attempting to infer item type", MsgId); |
2051 | 2051 | ||
@@ -2078,8 +2078,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2078 | MsgId, parts[parts.Length-1]); | 2078 | MsgId, parts[parts.Length-1]); |
2079 | if (ic.Item.AssetType == (int) AssetType.Unknown) | 2079 | if (ic.Item.AssetType == (int) AssetType.Unknown) |
2080 | ic.Item.AssetType = (int) AssetType.ImageJPEG; | 2080 | ic.Item.AssetType = (int) AssetType.ImageJPEG; |
2081 | if (ic.Item.InvType == (int) AssetType.Unknown) | 2081 | if (ic.Item.InvType == (int) InventoryType.Unknown) |
2082 | ic.Item.InvType = (int) AssetType.ImageJPEG; | 2082 | ic.Item.InvType = (int) InventoryType.Texture; |
2083 | break; | 2083 | break; |
2084 | case "jpg" : | 2084 | case "jpg" : |
2085 | case "jpeg" : | 2085 | case "jpeg" : |
@@ -2087,8 +2087,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2087 | MsgId, parts[parts.Length - 1]); | 2087 | MsgId, parts[parts.Length - 1]); |
2088 | if (ic.Item.AssetType == (int) AssetType.Unknown) | 2088 | if (ic.Item.AssetType == (int) AssetType.Unknown) |
2089 | ic.Item.AssetType = (int) AssetType.ImageJPEG; | 2089 | ic.Item.AssetType = (int) AssetType.ImageJPEG; |
2090 | if (ic.Item.InvType == (int) AssetType.Unknown) | 2090 | if (ic.Item.InvType == (int) InventoryType.Unknown) |
2091 | ic.Item.InvType = (int) AssetType.ImageJPEG; | 2091 | ic.Item.InvType = (int) InventoryType.Texture; |
2092 | break; | 2092 | break; |
2093 | case "tga" : | 2093 | case "tga" : |
2094 | if (parts[parts.Length - 2].IndexOf("_texture") != -1) | 2094 | if (parts[parts.Length - 2].IndexOf("_texture") != -1) |
@@ -2096,14 +2096,14 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
2096 | if (ic.Item.AssetType == (int) AssetType.Unknown) | 2096 | if (ic.Item.AssetType == (int) AssetType.Unknown) |
2097 | ic.Item.AssetType = (int) AssetType.TextureTGA; | 2097 | ic.Item.AssetType = (int) AssetType.TextureTGA; |
2098 | if (ic.Item.InvType == (int) AssetType.Unknown) | 2098 | if (ic.Item.InvType == (int) AssetType.Unknown) |
2099 | ic.Item.InvType = (int) AssetType.TextureTGA; | 2099 | ic.Item.InvType = (int) InventoryType.Texture; |
2100 | } | 2100 | } |
2101 | else | 2101 | else |
2102 | { | 2102 | { |
2103 | if (ic.Item.AssetType == (int) AssetType.Unknown) | 2103 | if (ic.Item.AssetType == (int) AssetType.Unknown) |
2104 | ic.Item.AssetType = (int) AssetType.ImageTGA; | 2104 | ic.Item.AssetType = (int) AssetType.ImageTGA; |
2105 | if (ic.Item.InvType == (int) AssetType.Unknown) | 2105 | if (ic.Item.InvType == (int) InventoryType.Unknown) |
2106 | ic.Item.InvType = (int) AssetType.ImageTGA; | 2106 | ic.Item.InvType = (int) InventoryType.Snapshot; |
2107 | } | 2107 | } |
2108 | break; | 2108 | break; |
2109 | default : | 2109 | default : |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 5809455..6e005b7 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -365,7 +365,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
365 | 365 | ||
366 | public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 366 | public string FetchInventoryDescendentsRequest(string request, string path, string param,OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
367 | { | 367 | { |
368 | m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + "request is "+request); | 368 | m_log.Debug("[CAPS]: FetchInventoryDescendentsRequest in region: " + m_regionName + " request is "+request); |
369 | 369 | ||
370 | // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us | 370 | // nasty temporary hack here, the linden client falsely identifies the uuid 00000000-0000-0000-0000-000000000000 as a string which breaks us |
371 | // correctly mark it as a uuid | 371 | // correctly mark it as a uuid |
@@ -512,8 +512,16 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
512 | llsdItem.item_id = invItem.ID; | 512 | llsdItem.item_id = invItem.ID; |
513 | llsdItem.name = invItem.Name; | 513 | llsdItem.name = invItem.Name; |
514 | llsdItem.parent_id = invItem.Folder; | 514 | llsdItem.parent_id = invItem.Folder; |
515 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); | 515 | try |
516 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); | 516 | { |
517 | // TODO reevaluate after upgrade to libomv >= r2566. Probably should use UtilsConversions. | ||
518 | llsdItem.type = TaskInventoryItem.Types[invItem.AssetType]; | ||
519 | llsdItem.inv_type = TaskInventoryItem.InvTypes[invItem.InvType]; | ||
520 | } | ||
521 | catch (Exception e) | ||
522 | { | ||
523 | m_log.Error("[CAPS]: Problem setting asset/inventory type while converting inventory item " + invItem.Name + " to LLSD:", e); | ||
524 | } | ||
517 | llsdItem.permissions = new LLSDPermissions(); | 525 | llsdItem.permissions = new LLSDPermissions(); |
518 | llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid; | 526 | llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid; |
519 | llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; | 527 | llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 88416d3..1dcdc06 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -490,7 +490,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
490 | 490 | ||
491 | if (Permissions.PropagatePermissions()) | 491 | if (Permissions.PropagatePermissions()) |
492 | { | 492 | { |
493 | if (item.InvType == 6) | 493 | if (item.InvType == (int)InventoryType.Object) |
494 | { | 494 | { |
495 | itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); | 495 | itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); |
496 | itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; | 496 | itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; |
@@ -899,7 +899,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
899 | TryGetAvatar(remoteClient.AgentId, out presence); | 899 | TryGetAvatar(remoteClient.AgentId, out presence); |
900 | byte[] data = null; | 900 | byte[] data = null; |
901 | 901 | ||
902 | if (invType == 3 && presence != null) // OpenMetaverse.asset.assettype.landmark = 3 - needs to be turned into an enum | 902 | if (invType == (sbyte)InventoryType.Landmark && presence != null) |
903 | { | 903 | { |
904 | Vector3 pos = presence.AbsolutePosition; | 904 | Vector3 pos = presence.AbsolutePosition; |
905 | string strdata = String.Format( | 905 | string strdata = String.Format( |
@@ -1098,7 +1098,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1098 | 1098 | ||
1099 | if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions()) | 1099 | if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions()) |
1100 | { | 1100 | { |
1101 | if (taskItem.InvType == 6) | 1101 | if (taskItem.InvType == (int)InventoryType.Object) |
1102 | agentItem.BasePermissions = taskItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13); | 1102 | agentItem.BasePermissions = taskItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13); |
1103 | else | 1103 | else |
1104 | agentItem.BasePermissions = taskItem.BasePermissions; | 1104 | agentItem.BasePermissions = taskItem.BasePermissions; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 6bf1654..d03fec2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
776 | 776 | ||
777 | foreach (TaskInventoryItem item in m_items.Values) | 777 | foreach (TaskInventoryItem item in m_items.Values) |
778 | { | 778 | { |
779 | if (item.InvType != 6) | 779 | if (item.InvType != (int)InventoryType.Object) |
780 | { | 780 | { |
781 | if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) | 781 | if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) |
782 | mask &= ~((uint)PermissionMask.Copy >> 13); | 782 | mask &= ~((uint)PermissionMask.Copy >> 13); |
@@ -809,7 +809,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
809 | { | 809 | { |
810 | foreach (TaskInventoryItem item in m_items.Values) | 810 | foreach (TaskInventoryItem item in m_items.Values) |
811 | { | 811 | { |
812 | if (item.InvType == 6 && (item.CurrentPermissions & 7) != 0) | 812 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) |
813 | { | 813 | { |
814 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) | 814 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) |
815 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; | 815 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; |
@@ -840,7 +840,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
840 | { | 840 | { |
841 | foreach (TaskInventoryItem item in m_items.Values) | 841 | foreach (TaskInventoryItem item in m_items.Values) |
842 | { | 842 | { |
843 | if (item.InvType == 10) | 843 | if (item.InvType == (int)InventoryType.LSL) |
844 | { | 844 | { |
845 | return true; | 845 | return true; |
846 | } | 846 | } |
@@ -866,7 +866,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
866 | 866 | ||
867 | foreach (TaskInventoryItem item in m_items.Values) | 867 | foreach (TaskInventoryItem item in m_items.Values) |
868 | { | 868 | { |
869 | if (item.InvType == 10) | 869 | if (item.InvType == (int)InventoryType.LSL) |
870 | { | 870 | { |
871 | foreach (IScriptModule e in engines) | 871 | foreach (IScriptModule e in engines) |
872 | { | 872 | { |
@@ -890,7 +890,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
890 | 890 | ||
891 | foreach (TaskInventoryItem item in m_items.Values) | 891 | foreach (TaskInventoryItem item in m_items.Values) |
892 | { | 892 | { |
893 | if (item.InvType == 10) | 893 | if (item.InvType == (int)InventoryType.LSL) |
894 | { | 894 | { |
895 | foreach (IScriptModule e in engines) | 895 | foreach (IScriptModule e in engines) |
896 | { | 896 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1cd25e7..e5c59aa 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1351,8 +1351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1351 | taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch(); | 1351 | taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch(); |
1352 | taskItem.Name = asset.Name; | 1352 | taskItem.Name = asset.Name; |
1353 | taskItem.Description = asset.Description; | 1353 | taskItem.Description = asset.Description; |
1354 | taskItem.Type = 7; | 1354 | taskItem.Type = (int)AssetType.Notecard; |
1355 | taskItem.InvType = 7; | 1355 | taskItem.InvType = (int)InventoryType.Notecard; |
1356 | taskItem.OwnerID = m_host.OwnerID; | 1356 | taskItem.OwnerID = m_host.OwnerID; |
1357 | taskItem.CreatorID = m_host.OwnerID; | 1357 | taskItem.CreatorID = m_host.OwnerID; |
1358 | taskItem.BasePermissions = (uint)PermissionMask.All; | 1358 | taskItem.BasePermissions = (uint)PermissionMask.All; |
diff --git a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml index 7b62a78..2a6ceb4 100644 --- a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml +++ b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml | |||
@@ -6,7 +6,7 @@ | |||
6 | <Key Name="name" Value="place_marker" /> | 6 | <Key Name="name" Value="place_marker" /> |
7 | <Key Name="description" Value="simple part-body standing, use low-priority to allow others - contributed by Mo Hax" /> | 7 | <Key Name="description" Value="simple part-body standing, use low-priority to allow others - contributed by Mo Hax" /> |
8 | <Key Name="assetType" Value="20" /> | 8 | <Key Name="assetType" Value="20" /> |
9 | <Key Name="inventoryType" Value="20" /> | 9 | <Key Name="inventoryType" Value="19" /> |
10 | </Section> | 10 | </Section> |
11 | <Section Name="tpose2"> | 11 | <Section Name="tpose2"> |
12 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 12 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -15,7 +15,7 @@ | |||
15 | <Key Name="name" Value="tpose2" /> | 15 | <Key Name="name" Value="tpose2" /> |
16 | <Key Name="description" Value="a tpose more suitable for posing stands - contributed by Mo Hax" /> | 16 | <Key Name="description" Value="a tpose more suitable for posing stands - contributed by Mo Hax" /> |
17 | <Key Name="assetType" Value="20" /> | 17 | <Key Name="assetType" Value="20" /> |
18 | <Key Name="inventoryType" Value="20" /> | 18 | <Key Name="inventoryType" Value="19" /> |
19 | </Section> | 19 | </Section> |
20 | <Section Name="bouncy_ball_left"> | 20 | <Section Name="bouncy_ball_left"> |
21 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 21 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -24,7 +24,7 @@ | |||
24 | <Key Name="name" Value="bouncy_ball_left" /> | 24 | <Key Name="name" Value="bouncy_ball_left" /> |
25 | <Key Name="description" Value="turn left on bouncy ball, grasping - contributed by Mo Hax" /> | 25 | <Key Name="description" Value="turn left on bouncy ball, grasping - contributed by Mo Hax" /> |
26 | <Key Name="assetType" Value="20" /> | 26 | <Key Name="assetType" Value="20" /> |
27 | <Key Name="inventoryType" Value="20" /> | 27 | <Key Name="inventoryType" Value="19" /> |
28 | </Section> | 28 | </Section> |
29 | <Section Name="tpose"> | 29 | <Section Name="tpose"> |
30 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 30 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -33,7 +33,7 @@ | |||
33 | <Key Name="name" Value="tpose" /> | 33 | <Key Name="name" Value="tpose" /> |
34 | <Key Name="description" Value="the standard tpose (all must start with this in frame 1) - contributed by Mo Hax" /> | 34 | <Key Name="description" Value="the standard tpose (all must start with this in frame 1) - contributed by Mo Hax" /> |
35 | <Key Name="assetType" Value="20" /> | 35 | <Key Name="assetType" Value="20" /> |
36 | <Key Name="inventoryType" Value="20" /> | 36 | <Key Name="inventoryType" Value="19" /> |
37 | </Section> | 37 | </Section> |
38 | <Section Name="handshake"> | 38 | <Section Name="handshake"> |
39 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 39 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -42,7 +42,7 @@ | |||
42 | <Key Name="name" Value="handshake" /> | 42 | <Key Name="name" Value="handshake" /> |
43 | <Key Name="description" Value="a simple right-handed, double-pump handshake, (30x30fps) - contributed by Mo Hax" /> | 43 | <Key Name="description" Value="a simple right-handed, double-pump handshake, (30x30fps) - contributed by Mo Hax" /> |
44 | <Key Name="assetType" Value="20" /> | 44 | <Key Name="assetType" Value="20" /> |
45 | <Key Name="inventoryType" Value="20" /> | 45 | <Key Name="inventoryType" Value="19" /> |
46 | </Section> | 46 | </Section> |
47 | <Section Name="give_and_handshake"> | 47 | <Section Name="give_and_handshake"> |
48 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 48 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -51,7 +51,7 @@ | |||
51 | <Key Name="name" Value="give_and_handshake" /> | 51 | <Key Name="name" Value="give_and_handshake" /> |
52 | <Key Name="description" Value="same as handshake, but gives something with left hand first (30x30fps) - contributed by Mo Hax" /> | 52 | <Key Name="description" Value="same as handshake, but gives something with left hand first (30x30fps) - contributed by Mo Hax" /> |
53 | <Key Name="assetType" Value="20" /> | 53 | <Key Name="assetType" Value="20" /> |
54 | <Key Name="inventoryType" Value="20" /> | 54 | <Key Name="inventoryType" Value="19" /> |
55 | </Section> | 55 | </Section> |
56 | <Section Name="bouncy_ball_walk"> | 56 | <Section Name="bouncy_ball_walk"> |
57 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 57 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -60,7 +60,7 @@ | |||
60 | <Key Name="name" Value="bouncy_ball_walk" /> | 60 | <Key Name="name" Value="bouncy_ball_walk" /> |
61 | <Key Name="description" Value="move foward on bouncy ball, walk speed, grasping - contributed by Mo Hax" /> | 61 | <Key Name="description" Value="move foward on bouncy ball, walk speed, grasping - contributed by Mo Hax" /> |
62 | <Key Name="assetType" Value="20" /> | 62 | <Key Name="assetType" Value="20" /> |
63 | <Key Name="inventoryType" Value="20" /> | 63 | <Key Name="inventoryType" Value="19" /> |
64 | </Section> | 64 | </Section> |
65 | <Section Name="bouncy_ball_run"> | 65 | <Section Name="bouncy_ball_run"> |
66 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 66 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -69,7 +69,7 @@ | |||
69 | <Key Name="name" Value="bouncy_ball_run" /> | 69 | <Key Name="name" Value="bouncy_ball_run" /> |
70 | <Key Name="description" Value="move foward on bouncy ball, run speed, grasping - contributed by Mo Hax" /> | 70 | <Key Name="description" Value="move foward on bouncy ball, run speed, grasping - contributed by Mo Hax" /> |
71 | <Key Name="assetType" Value="20" /> | 71 | <Key Name="assetType" Value="20" /> |
72 | <Key Name="inventoryType" Value="20" /> | 72 | <Key Name="inventoryType" Value="19" /> |
73 | </Section> | 73 | </Section> |
74 | <Section Name="windsurf_left"> | 74 | <Section Name="windsurf_left"> |
75 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 75 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -78,7 +78,7 @@ | |||
78 | <Key Name="name" Value="windsurf_left" /> | 78 | <Key Name="name" Value="windsurf_left" /> |
79 | <Key Name="description" Value="static, full body, pose of windsurfer, left foot forward - contributed by Mo Hax" /> | 79 | <Key Name="description" Value="static, full body, pose of windsurfer, left foot forward - contributed by Mo Hax" /> |
80 | <Key Name="assetType" Value="20" /> | 80 | <Key Name="assetType" Value="20" /> |
81 | <Key Name="inventoryType" Value="20" /> | 81 | <Key Name="inventoryType" Value="19" /> |
82 | </Section> | 82 | </Section> |
83 | <Section Name="bouncy_ball_super"> | 83 | <Section Name="bouncy_ball_super"> |
84 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 84 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -87,7 +87,7 @@ | |||
87 | <Key Name="name" Value="bouncy_ball_super" /> | 87 | <Key Name="name" Value="bouncy_ball_super" /> |
88 | <Key Name="description" Value="super bounce on bouncy ball, matrix-like, grasping - contributed by Mo Hax" /> | 88 | <Key Name="description" Value="super bounce on bouncy ball, matrix-like, grasping - contributed by Mo Hax" /> |
89 | <Key Name="assetType" Value="20" /> | 89 | <Key Name="assetType" Value="20" /> |
90 | <Key Name="inventoryType" Value="20" /> | 90 | <Key Name="inventoryType" Value="19" /> |
91 | </Section> | 91 | </Section> |
92 | <Section Name="bouncy_ball_right"> | 92 | <Section Name="bouncy_ball_right"> |
93 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 93 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -96,7 +96,7 @@ | |||
96 | <Key Name="name" Value="bouncy_ball_right" /> | 96 | <Key Name="name" Value="bouncy_ball_right" /> |
97 | <Key Name="description" Value="turn right on bouncy ball, grasping - contributed by Mo Hax" /> | 97 | <Key Name="description" Value="turn right on bouncy ball, grasping - contributed by Mo Hax" /> |
98 | <Key Name="assetType" Value="20" /> | 98 | <Key Name="assetType" Value="20" /> |
99 | <Key Name="inventoryType" Value="20" /> | 99 | <Key Name="inventoryType" Value="19" /> |
100 | </Section> | 100 | </Section> |
101 | <Section Name="autograph_right"> | 101 | <Section Name="autograph_right"> |
102 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> | 102 | <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/> |
@@ -105,7 +105,7 @@ | |||
105 | <Key Name="name" Value="autograph_right" /> | 105 | <Key Name="name" Value="autograph_right" /> |
106 | <Key Name="description" Value="part-body, right-handed signing autograph with left give - contributed by Mo Hax" /> | 106 | <Key Name="description" Value="part-body, right-handed signing autograph with left give - contributed by Mo Hax" /> |
107 | <Key Name="assetType" Value="20" /> | 107 | <Key Name="assetType" Value="20" /> |
108 | <Key Name="inventoryType" Value="20" /> | 108 | <Key Name="inventoryType" Value="19" /> |
109 | </Section> | 109 | </Section> |
110 | 110 | ||
111 | 111 | ||
diff --git a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml index de96f7b..1312129 100644 --- a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml +++ b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml | |||
@@ -6,7 +6,7 @@ | |||
6 | <Key Name="description" Value="2008-10-03 14:10:00 gesture" /> | 6 | <Key Name="description" Value="2008-10-03 14:10:00 gesture" /> |
7 | <Key Name="name" Value="can we move along?" /> | 7 | <Key Name="name" Value="can we move along?" /> |
8 | <Key Name="assetType" Value="21"/> | 8 | <Key Name="assetType" Value="21"/> |
9 | <Key Name="inventoryType" Value="21"/> | 9 | <Key Name="inventoryType" Value="20"/> |
10 | <Key Name="currentPermissions" Value="2147483647"/> | 10 | <Key Name="currentPermissions" Value="2147483647"/> |
11 | <Key Name="nextPermissions" Value="2147483647"/> | 11 | <Key Name="nextPermissions" Value="2147483647"/> |
12 | <Key Name="everyonePermissions" Value="2147483647" /> | 12 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -19,7 +19,7 @@ | |||
19 | <Key Name="description" Value="2008-10-03 14:17:16 gesture" /> | 19 | <Key Name="description" Value="2008-10-03 14:17:16 gesture" /> |
20 | <Key Name="name" Value="me!" /> | 20 | <Key Name="name" Value="me!" /> |
21 | <Key Name="assetType" Value="21"/> | 21 | <Key Name="assetType" Value="21"/> |
22 | <Key Name="inventoryType" Value="21"/> | 22 | <Key Name="inventoryType" Value="20"/> |
23 | <Key Name="currentPermissions" Value="2147483647"/> | 23 | <Key Name="currentPermissions" Value="2147483647"/> |
24 | <Key Name="nextPermissions" Value="2147483647"/> | 24 | <Key Name="nextPermissions" Value="2147483647"/> |
25 | <Key Name="everyonePermissions" Value="2147483647" /> | 25 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -32,7 +32,7 @@ | |||
32 | <Key Name="description" Value="2008-10-03 14:29:00 gesture" /> | 32 | <Key Name="description" Value="2008-10-03 14:29:00 gesture" /> |
33 | <Key Name="name" Value="clap" /> | 33 | <Key Name="name" Value="clap" /> |
34 | <Key Name="assetType" Value="21"/> | 34 | <Key Name="assetType" Value="21"/> |
35 | <Key Name="inventoryType" Value="21"/> | 35 | <Key Name="inventoryType" Value="20"/> |
36 | <Key Name="currentPermissions" Value="2147483647"/> | 36 | <Key Name="currentPermissions" Value="2147483647"/> |
37 | <Key Name="nextPermissions" Value="2147483647"/> | 37 | <Key Name="nextPermissions" Value="2147483647"/> |
38 | <Key Name="everyonePermissions" Value="2147483647" /> | 38 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -45,7 +45,7 @@ | |||
45 | <Key Name="description" Value="2008-10-03 14:10:03 gesture" /> | 45 | <Key Name="description" Value="2008-10-03 14:10:03 gesture" /> |
46 | <Key Name="name" Value="no" /> | 46 | <Key Name="name" Value="no" /> |
47 | <Key Name="assetType" Value="21"/> | 47 | <Key Name="assetType" Value="21"/> |
48 | <Key Name="inventoryType" Value="21"/> | 48 | <Key Name="inventoryType" Value="20"/> |
49 | <Key Name="currentPermissions" Value="2147483647"/> | 49 | <Key Name="currentPermissions" Value="2147483647"/> |
50 | <Key Name="nextPermissions" Value="2147483647"/> | 50 | <Key Name="nextPermissions" Value="2147483647"/> |
51 | <Key Name="everyonePermissions" Value="2147483647" /> | 51 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -58,7 +58,7 @@ | |||
58 | <Key Name="description" Value="2008-10-03 14:17:13 gesture" /> | 58 | <Key Name="description" Value="2008-10-03 14:17:13 gesture" /> |
59 | <Key Name="name" Value="suprised" /> | 59 | <Key Name="name" Value="suprised" /> |
60 | <Key Name="assetType" Value="21"/> | 60 | <Key Name="assetType" Value="21"/> |
61 | <Key Name="inventoryType" Value="21"/> | 61 | <Key Name="inventoryType" Value="20"/> |
62 | <Key Name="currentPermissions" Value="2147483647"/> | 62 | <Key Name="currentPermissions" Value="2147483647"/> |
63 | <Key Name="nextPermissions" Value="2147483647"/> | 63 | <Key Name="nextPermissions" Value="2147483647"/> |
64 | <Key Name="everyonePermissions" Value="2147483647" /> | 64 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -71,7 +71,7 @@ | |||
71 | <Key Name="description" Value="2008-10-03 14:33:04 gesture" /> | 71 | <Key Name="description" Value="2008-10-03 14:33:04 gesture" /> |
72 | <Key Name="name" Value="dance2" /> | 72 | <Key Name="name" Value="dance2" /> |
73 | <Key Name="assetType" Value="21"/> | 73 | <Key Name="assetType" Value="21"/> |
74 | <Key Name="inventoryType" Value="21"/> | 74 | <Key Name="inventoryType" Value="20"/> |
75 | <Key Name="currentPermissions" Value="2147483647"/> | 75 | <Key Name="currentPermissions" Value="2147483647"/> |
76 | <Key Name="nextPermissions" Value="2147483647"/> | 76 | <Key Name="nextPermissions" Value="2147483647"/> |
77 | <Key Name="everyonePermissions" Value="2147483647" /> | 77 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -84,7 +84,7 @@ | |||
84 | <Key Name="description" Value="2008-10-03 14:09:55 gesture" /> | 84 | <Key Name="description" Value="2008-10-03 14:09:55 gesture" /> |
85 | <Key Name="name" Value="definitely YES" /> | 85 | <Key Name="name" Value="definitely YES" /> |
86 | <Key Name="assetType" Value="21"/> | 86 | <Key Name="assetType" Value="21"/> |
87 | <Key Name="inventoryType" Value="21"/> | 87 | <Key Name="inventoryType" Value="20"/> |
88 | <Key Name="currentPermissions" Value="2147483647"/> | 88 | <Key Name="currentPermissions" Value="2147483647"/> |
89 | <Key Name="nextPermissions" Value="2147483647"/> | 89 | <Key Name="nextPermissions" Value="2147483647"/> |
90 | <Key Name="everyonePermissions" Value="2147483647" /> | 90 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -97,7 +97,7 @@ | |||
97 | <Key Name="description" Value="2008-10-03 14:01:58 gesture" /> | 97 | <Key Name="description" Value="2008-10-03 14:01:58 gesture" /> |
98 | <Key Name="name" Value="Wave" /> | 98 | <Key Name="name" Value="Wave" /> |
99 | <Key Name="assetType" Value="21"/> | 99 | <Key Name="assetType" Value="21"/> |
100 | <Key Name="inventoryType" Value="21"/> | 100 | <Key Name="inventoryType" Value="20"/> |
101 | <Key Name="currentPermissions" Value="2147483647"/> | 101 | <Key Name="currentPermissions" Value="2147483647"/> |
102 | <Key Name="nextPermissions" Value="2147483647"/> | 102 | <Key Name="nextPermissions" Value="2147483647"/> |
103 | <Key Name="everyonePermissions" Value="2147483647" /> | 103 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -110,7 +110,7 @@ | |||
110 | <Key Name="description" Value="2008-10-03 14:09:45 gesture" /> | 110 | <Key Name="description" Value="2008-10-03 14:09:45 gesture" /> |
111 | <Key Name="name" Value="take it outside" /> | 111 | <Key Name="name" Value="take it outside" /> |
112 | <Key Name="assetType" Value="21"/> | 112 | <Key Name="assetType" Value="21"/> |
113 | <Key Name="inventoryType" Value="21"/> | 113 | <Key Name="inventoryType" Value="20"/> |
114 | <Key Name="currentPermissions" Value="2147483647"/> | 114 | <Key Name="currentPermissions" Value="2147483647"/> |
115 | <Key Name="nextPermissions" Value="2147483647"/> | 115 | <Key Name="nextPermissions" Value="2147483647"/> |
116 | <Key Name="everyonePermissions" Value="2147483647" /> | 116 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -123,7 +123,7 @@ | |||
123 | <Key Name="description" Value="2008-10-03 14:10:06 gesture" /> | 123 | <Key Name="description" Value="2008-10-03 14:10:06 gesture" /> |
124 | <Key Name="name" Value="whoohoo!" /> | 124 | <Key Name="name" Value="whoohoo!" /> |
125 | <Key Name="assetType" Value="21"/> | 125 | <Key Name="assetType" Value="21"/> |
126 | <Key Name="inventoryType" Value="21"/> | 126 | <Key Name="inventoryType" Value="20"/> |
127 | <Key Name="currentPermissions" Value="2147483647"/> | 127 | <Key Name="currentPermissions" Value="2147483647"/> |
128 | <Key Name="nextPermissions" Value="2147483647"/> | 128 | <Key Name="nextPermissions" Value="2147483647"/> |
129 | <Key Name="everyonePermissions" Value="2147483647" /> | 129 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -136,7 +136,7 @@ | |||
136 | <Key Name="description" Value="2008-10-03 14:03:01 gesture" /> | 136 | <Key Name="description" Value="2008-10-03 14:03:01 gesture" /> |
137 | <Key Name="name" Value="raise hand" /> | 137 | <Key Name="name" Value="raise hand" /> |
138 | <Key Name="assetType" Value="21"/> | 138 | <Key Name="assetType" Value="21"/> |
139 | <Key Name="inventoryType" Value="21"/> | 139 | <Key Name="inventoryType" Value="20"/> |
140 | <Key Name="currentPermissions" Value="2147483647"/> | 140 | <Key Name="currentPermissions" Value="2147483647"/> |
141 | <Key Name="nextPermissions" Value="2147483647"/> | 141 | <Key Name="nextPermissions" Value="2147483647"/> |
142 | <Key Name="everyonePermissions" Value="2147483647" /> | 142 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -149,7 +149,7 @@ | |||
149 | <Key Name="description" Value="2008-10-03 14:09:57 gesture" /> | 149 | <Key Name="description" Value="2008-10-03 14:09:57 gesture" /> |
150 | <Key Name="name" Value="LOL" /> | 150 | <Key Name="name" Value="LOL" /> |
151 | <Key Name="assetType" Value="21"/> | 151 | <Key Name="assetType" Value="21"/> |
152 | <Key Name="inventoryType" Value="21"/> | 152 | <Key Name="inventoryType" Value="20"/> |
153 | <Key Name="currentPermissions" Value="2147483647"/> | 153 | <Key Name="currentPermissions" Value="2147483647"/> |
154 | <Key Name="nextPermissions" Value="2147483647"/> | 154 | <Key Name="nextPermissions" Value="2147483647"/> |
155 | <Key Name="everyonePermissions" Value="2147483647" /> | 155 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -162,7 +162,7 @@ | |||
162 | <Key Name="description" Value="2008-10-03 14:32:33 gesture" /> | 162 | <Key Name="description" Value="2008-10-03 14:32:33 gesture" /> |
163 | <Key Name="name" Value="dance1" /> | 163 | <Key Name="name" Value="dance1" /> |
164 | <Key Name="assetType" Value="21"/> | 164 | <Key Name="assetType" Value="21"/> |
165 | <Key Name="inventoryType" Value="21"/> | 165 | <Key Name="inventoryType" Value="20"/> |
166 | <Key Name="currentPermissions" Value="2147483647"/> | 166 | <Key Name="currentPermissions" Value="2147483647"/> |
167 | <Key Name="nextPermissions" Value="2147483647"/> | 167 | <Key Name="nextPermissions" Value="2147483647"/> |
168 | <Key Name="everyonePermissions" Value="2147483647" /> | 168 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -175,7 +175,7 @@ | |||
175 | <Key Name="description" Value="2008-10-03 14:17:09 gesture" /> | 175 | <Key Name="description" Value="2008-10-03 14:17:09 gesture" /> |
176 | <Key Name="name" Value="wink!" /> | 176 | <Key Name="name" Value="wink!" /> |
177 | <Key Name="assetType" Value="21"/> | 177 | <Key Name="assetType" Value="21"/> |
178 | <Key Name="inventoryType" Value="21"/> | 178 | <Key Name="inventoryType" Value="20"/> |
179 | <Key Name="currentPermissions" Value="2147483647"/> | 179 | <Key Name="currentPermissions" Value="2147483647"/> |
180 | <Key Name="nextPermissions" Value="2147483647"/> | 180 | <Key Name="nextPermissions" Value="2147483647"/> |
181 | <Key Name="everyonePermissions" Value="2147483647" /> | 181 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -188,7 +188,7 @@ | |||
188 | <Key Name="description" Value="2008-10-03 14:10:09 gesture" /> | 188 | <Key Name="description" Value="2008-10-03 14:10:09 gesture" /> |
189 | <Key Name="name" Value="not sure" /> | 189 | <Key Name="name" Value="not sure" /> |
190 | <Key Name="assetType" Value="21"/> | 190 | <Key Name="assetType" Value="21"/> |
191 | <Key Name="inventoryType" Value="21"/> | 191 | <Key Name="inventoryType" Value="20"/> |
192 | <Key Name="currentPermissions" Value="2147483647"/> | 192 | <Key Name="currentPermissions" Value="2147483647"/> |
193 | <Key Name="nextPermissions" Value="2147483647"/> | 193 | <Key Name="nextPermissions" Value="2147483647"/> |
194 | <Key Name="everyonePermissions" Value="2147483647" /> | 194 | <Key Name="everyonePermissions" Value="2147483647" /> |
@@ -201,7 +201,7 @@ | |||
201 | <Key Name="description" Value="2008-10-03 14:33:41 gesture" /> | 201 | <Key Name="description" Value="2008-10-03 14:33:41 gesture" /> |
202 | <Key Name="name" Value="dance3" /> | 202 | <Key Name="name" Value="dance3" /> |
203 | <Key Name="assetType" Value="21"/> | 203 | <Key Name="assetType" Value="21"/> |
204 | <Key Name="inventoryType" Value="21"/> | 204 | <Key Name="inventoryType" Value="20"/> |
205 | <Key Name="currentPermissions" Value="2147483647"/> | 205 | <Key Name="currentPermissions" Value="2147483647"/> |
206 | <Key Name="nextPermissions" Value="2147483647"/> | 206 | <Key Name="nextPermissions" Value="2147483647"/> |
207 | <Key Name="everyonePermissions" Value="2147483647" /> | 207 | <Key Name="everyonePermissions" Value="2147483647" /> |