aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/inventory/GesturesLibrary
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/GesturesLibrary
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/GesturesLibrary')
-rw-r--r--bin/inventory/GesturesLibrary/GesturesLibraryItems.xml32
1 files changed, 16 insertions, 16 deletions
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" />
generated by cgit v1.1 at 2024-06-30 23:25:53 +0000