From 1d234ca83f64b31b559ace3f63ebbba9f4903778 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sat, 9 May 2009 21:11:12 +0000
Subject: 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

---
 .../AnimationsLibrary/AnimationsLibraryItems.xml   | 24 ++++++++--------
 .../GesturesLibrary/GesturesLibraryItems.xml       | 32 +++++++++++-----------
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'bin/inventory')

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 @@
     <Key Name="name" Value="place_marker" />
     <Key Name="description" Value="simple part-body standing, use low-priority to allow others - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="tpose2">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -15,7 +15,7 @@
     <Key Name="name" Value="tpose2" />
     <Key Name="description" Value="a tpose more suitable for posing stands - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="bouncy_ball_left">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -24,7 +24,7 @@
     <Key Name="name" Value="bouncy_ball_left" />
     <Key Name="description" Value="turn left on bouncy ball, grasping - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="tpose">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -33,7 +33,7 @@
     <Key Name="name" Value="tpose" />
     <Key Name="description" Value="the standard tpose (all must start with this in frame 1) - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="handshake">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -42,7 +42,7 @@
     <Key Name="name" Value="handshake" />
     <Key Name="description" Value="a simple right-handed, double-pump handshake, (30x30fps) - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="give_and_handshake">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -51,7 +51,7 @@
     <Key Name="name" Value="give_and_handshake" />
     <Key Name="description" Value="same as handshake, but gives something with left hand first (30x30fps) - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="bouncy_ball_walk">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -60,7 +60,7 @@
     <Key Name="name" Value="bouncy_ball_walk" />
     <Key Name="description" Value="move foward on bouncy ball, walk speed, grasping - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="bouncy_ball_run">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -69,7 +69,7 @@
     <Key Name="name" Value="bouncy_ball_run" />
     <Key Name="description" Value="move foward on bouncy ball, run speed, grasping - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="windsurf_left">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -78,7 +78,7 @@
     <Key Name="name" Value="windsurf_left" />
     <Key Name="description" Value="static, full body, pose of windsurfer, left foot forward - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="bouncy_ball_super">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -87,7 +87,7 @@
     <Key Name="name" Value="bouncy_ball_super" />
     <Key Name="description" Value="super bounce on bouncy ball, matrix-like, grasping - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="bouncy_ball_right">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -96,7 +96,7 @@
     <Key Name="name" Value="bouncy_ball_right" />
     <Key Name="description" Value="turn right on bouncy ball, grasping - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
   <Section Name="autograph_right">
     <Key Name="folderID" Value="f0908f10-b9bf-11dc-95ff-0800200c9a66"/>
@@ -105,7 +105,7 @@
     <Key Name="name" Value="autograph_right" />
     <Key Name="description" Value="part-body, right-handed signing autograph with left give - contributed by Mo Hax" />
     <Key Name="assetType" Value="20" />
-    <Key Name="inventoryType" Value="20" />
+    <Key Name="inventoryType" Value="19" />
   </Section>
 
   
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 @@
 		<Key Name="description" Value="2008-10-03 14:10:00 gesture" />
 		<Key Name="name" Value="can we move along?" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -19,7 +19,7 @@
 		<Key Name="description" Value="2008-10-03 14:17:16 gesture" />
 		<Key Name="name" Value="me!" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -32,7 +32,7 @@
 		<Key Name="description" Value="2008-10-03 14:29:00 gesture" />
 		<Key Name="name" Value="clap" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -45,7 +45,7 @@
 		<Key Name="description" Value="2008-10-03 14:10:03 gesture" />
 		<Key Name="name" Value="no" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -58,7 +58,7 @@
 		<Key Name="description" Value="2008-10-03 14:17:13 gesture" />
 		<Key Name="name" Value="suprised" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -71,7 +71,7 @@
 		<Key Name="description" Value="2008-10-03 14:33:04 gesture" />
 		<Key Name="name" Value="dance2" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -84,7 +84,7 @@
 		<Key Name="description" Value="2008-10-03 14:09:55 gesture" />
 		<Key Name="name" Value="definitely YES" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -97,7 +97,7 @@
 		<Key Name="description" Value="2008-10-03 14:01:58 gesture" />
 		<Key Name="name" Value="Wave" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -110,7 +110,7 @@
 		<Key Name="description" Value="2008-10-03 14:09:45 gesture" />
 		<Key Name="name" Value="take it outside" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -123,7 +123,7 @@
 		<Key Name="description" Value="2008-10-03 14:10:06 gesture" />
 		<Key Name="name" Value="whoohoo!" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -136,7 +136,7 @@
 		<Key Name="description" Value="2008-10-03 14:03:01 gesture" />
 		<Key Name="name" Value="raise hand" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -149,7 +149,7 @@
 		<Key Name="description" Value="2008-10-03 14:09:57 gesture" />
 		<Key Name="name" Value="LOL" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -162,7 +162,7 @@
 		<Key Name="description" Value="2008-10-03 14:32:33 gesture" />
 		<Key Name="name" Value="dance1" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -175,7 +175,7 @@
 		<Key Name="description" Value="2008-10-03 14:17:09 gesture" />
 		<Key Name="name" Value="wink!" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -188,7 +188,7 @@
 		<Key Name="description" Value="2008-10-03 14:10:09 gesture" />
 		<Key Name="name" Value="not sure" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
@@ -201,7 +201,7 @@
 		<Key Name="description" Value="2008-10-03 14:33:41 gesture" />
 		<Key Name="name" Value="dance3" />
 		<Key Name="assetType" Value="21"/>
-		<Key Name="inventoryType" Value="21"/>
+		<Key Name="inventoryType" Value="20"/>
 		<Key Name="currentPermissions" Value="2147483647"/>
 		<Key Name="nextPermissions" Value="2147483647"/>
 		<Key Name="everyonePermissions" Value="2147483647" />
-- 
cgit v1.1