aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml
diff options
context:
space:
mode:
authorHomer Horwitz2009-05-09 21:11:12 +0000
committerHomer Horwitz2009-05-09 21:11:12 +0000
commit1d234ca83f64b31b559ace3f63ebbba9f4903778 (patch)
tree887ba461d3ff20432806672786cbb82ff39b9aa4 /bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml
parent* Code to make MRM debugging easier. (diff)
downloadopensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.zip
opensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.gz
opensim-SC_OLD-1d234ca83f64b31b559ace3f63ebbba9f4903778.tar.bz2
opensim-SC_OLD-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 'bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml')
-rw-r--r--bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml24
1 files changed, 12 insertions, 12 deletions
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
generated by cgit v1.1 at 2024-07-01 00:36:24 +0000