diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /bin/inventory/GesturesLibrary/GesturesLibraryItems.xml | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'bin/inventory/GesturesLibrary/GesturesLibraryItems.xml')
-rw-r--r-- | bin/inventory/GesturesLibrary/GesturesLibraryItems.xml | 80 |
1 files changed, 16 insertions, 64 deletions
diff --git a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml index 1312129..ca3ce2d 100644 --- a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml +++ b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml | |||
@@ -7,11 +7,8 @@ | |||
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="20"/> | 9 | <Key Name="inventoryType" Value="20"/> |
10 | <Key Name="currentPermissions" Value="2147483647"/> | ||
11 | <Key Name="nextPermissions" Value="2147483647"/> | ||
12 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
13 | <Key Name="basePermissions" Value="2147483647"/> | ||
14 | </Section> | 10 | </Section> |
11 | |||
15 | <Section Name="me!"> | 12 | <Section Name="me!"> |
16 | <Key Name="inventoryID" Value="4c141851-1bef-4c00-9058-8c4d97ab48fe"/> | 13 | <Key Name="inventoryID" Value="4c141851-1bef-4c00-9058-8c4d97ab48fe"/> |
17 | <Key Name="assetID" Value="652475bc-ffb7-4a18-b6bb-7731ddeb6a51"/> | 14 | <Key Name="assetID" Value="652475bc-ffb7-4a18-b6bb-7731ddeb6a51"/> |
@@ -20,11 +17,8 @@ | |||
20 | <Key Name="name" Value="me!" /> | 17 | <Key Name="name" Value="me!" /> |
21 | <Key Name="assetType" Value="21"/> | 18 | <Key Name="assetType" Value="21"/> |
22 | <Key Name="inventoryType" Value="20"/> | 19 | <Key Name="inventoryType" Value="20"/> |
23 | <Key Name="currentPermissions" Value="2147483647"/> | ||
24 | <Key Name="nextPermissions" Value="2147483647"/> | ||
25 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
26 | <Key Name="basePermissions" Value="2147483647"/> | ||
27 | </Section> | 20 | </Section> |
21 | |||
28 | <Section Name="clap"> | 22 | <Section Name="clap"> |
29 | <Key Name="inventoryID" Value="a5a30fdb-613f-44fa-8bc2-7806e4da67f6"/> | 23 | <Key Name="inventoryID" Value="a5a30fdb-613f-44fa-8bc2-7806e4da67f6"/> |
30 | <Key Name="assetID" Value="712e81fd-a215-498c-ab1a-caf1f5bf950d"/> | 24 | <Key Name="assetID" Value="712e81fd-a215-498c-ab1a-caf1f5bf950d"/> |
@@ -33,11 +27,8 @@ | |||
33 | <Key Name="name" Value="clap" /> | 27 | <Key Name="name" Value="clap" /> |
34 | <Key Name="assetType" Value="21"/> | 28 | <Key Name="assetType" Value="21"/> |
35 | <Key Name="inventoryType" Value="20"/> | 29 | <Key Name="inventoryType" Value="20"/> |
36 | <Key Name="currentPermissions" Value="2147483647"/> | ||
37 | <Key Name="nextPermissions" Value="2147483647"/> | ||
38 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
39 | <Key Name="basePermissions" Value="2147483647"/> | ||
40 | </Section> | 30 | </Section> |
31 | |||
41 | <Section Name="no"> | 32 | <Section Name="no"> |
42 | <Key Name="inventoryID" Value="514b3ca6-1571-4f58-a24e-f58eb5cb8460"/> | 33 | <Key Name="inventoryID" Value="514b3ca6-1571-4f58-a24e-f58eb5cb8460"/> |
43 | <Key Name="assetID" Value="6c123970-0f5a-448e-920a-07bae9aadf4c"/> | 34 | <Key Name="assetID" Value="6c123970-0f5a-448e-920a-07bae9aadf4c"/> |
@@ -46,11 +37,8 @@ | |||
46 | <Key Name="name" Value="no" /> | 37 | <Key Name="name" Value="no" /> |
47 | <Key Name="assetType" Value="21"/> | 38 | <Key Name="assetType" Value="21"/> |
48 | <Key Name="inventoryType" Value="20"/> | 39 | <Key Name="inventoryType" Value="20"/> |
49 | <Key Name="currentPermissions" Value="2147483647"/> | ||
50 | <Key Name="nextPermissions" Value="2147483647"/> | ||
51 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
52 | <Key Name="basePermissions" Value="2147483647"/> | ||
53 | </Section> | 40 | </Section> |
41 | |||
54 | <Section Name="suprised"> | 42 | <Section Name="suprised"> |
55 | <Key Name="inventoryID" Value="120fb1f3-112b-4bc4-a7d3-a784ecc360af"/> | 43 | <Key Name="inventoryID" Value="120fb1f3-112b-4bc4-a7d3-a784ecc360af"/> |
56 | <Key Name="assetID" Value="dbaf104b-cba8-4df7-b5d3-0cb57d0d63b2"/> | 44 | <Key Name="assetID" Value="dbaf104b-cba8-4df7-b5d3-0cb57d0d63b2"/> |
@@ -59,11 +47,8 @@ | |||
59 | <Key Name="name" Value="suprised" /> | 47 | <Key Name="name" Value="suprised" /> |
60 | <Key Name="assetType" Value="21"/> | 48 | <Key Name="assetType" Value="21"/> |
61 | <Key Name="inventoryType" Value="20"/> | 49 | <Key Name="inventoryType" Value="20"/> |
62 | <Key Name="currentPermissions" Value="2147483647"/> | ||
63 | <Key Name="nextPermissions" Value="2147483647"/> | ||
64 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
65 | <Key Name="basePermissions" Value="2147483647"/> | ||
66 | </Section> | 50 | </Section> |
51 | |||
67 | <Section Name="dance2"> | 52 | <Section Name="dance2"> |
68 | <Key Name="inventoryID" Value="1ca0e368-5a11-4da1-8503-925a55e7c45f"/> | 53 | <Key Name="inventoryID" Value="1ca0e368-5a11-4da1-8503-925a55e7c45f"/> |
69 | <Key Name="assetID" Value="3bd1792a-6756-4ee0-a54e-3ae6493c2036"/> | 54 | <Key Name="assetID" Value="3bd1792a-6756-4ee0-a54e-3ae6493c2036"/> |
@@ -72,11 +57,8 @@ | |||
72 | <Key Name="name" Value="dance2" /> | 57 | <Key Name="name" Value="dance2" /> |
73 | <Key Name="assetType" Value="21"/> | 58 | <Key Name="assetType" Value="21"/> |
74 | <Key Name="inventoryType" Value="20"/> | 59 | <Key Name="inventoryType" Value="20"/> |
75 | <Key Name="currentPermissions" Value="2147483647"/> | ||
76 | <Key Name="nextPermissions" Value="2147483647"/> | ||
77 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
78 | <Key Name="basePermissions" Value="2147483647"/> | ||
79 | </Section> | 60 | </Section> |
61 | |||
80 | <Section Name="definitely YES"> | 62 | <Section Name="definitely YES"> |
81 | <Key Name="inventoryID" Value="022fa770-abb1-4266-963a-4ece4747b748"/> | 63 | <Key Name="inventoryID" Value="022fa770-abb1-4266-963a-4ece4747b748"/> |
82 | <Key Name="assetID" Value="392c292f-3d27-45ff-9437-c79c06699237"/> | 64 | <Key Name="assetID" Value="392c292f-3d27-45ff-9437-c79c06699237"/> |
@@ -85,11 +67,8 @@ | |||
85 | <Key Name="name" Value="definitely YES" /> | 67 | <Key Name="name" Value="definitely YES" /> |
86 | <Key Name="assetType" Value="21"/> | 68 | <Key Name="assetType" Value="21"/> |
87 | <Key Name="inventoryType" Value="20"/> | 69 | <Key Name="inventoryType" Value="20"/> |
88 | <Key Name="currentPermissions" Value="2147483647"/> | ||
89 | <Key Name="nextPermissions" Value="2147483647"/> | ||
90 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
91 | <Key Name="basePermissions" Value="2147483647"/> | ||
92 | </Section> | 70 | </Section> |
71 | |||
93 | <Section Name="Wave"> | 72 | <Section Name="Wave"> |
94 | <Key Name="inventoryID" Value="6406a7c6-a690-44be-a444-ba723e50c17d"/> | 73 | <Key Name="inventoryID" Value="6406a7c6-a690-44be-a444-ba723e50c17d"/> |
95 | <Key Name="assetID" Value="cce0e317-2c49-411e-8716-f9ce3007c715"/> | 74 | <Key Name="assetID" Value="cce0e317-2c49-411e-8716-f9ce3007c715"/> |
@@ -98,11 +77,8 @@ | |||
98 | <Key Name="name" Value="Wave" /> | 77 | <Key Name="name" Value="Wave" /> |
99 | <Key Name="assetType" Value="21"/> | 78 | <Key Name="assetType" Value="21"/> |
100 | <Key Name="inventoryType" Value="20"/> | 79 | <Key Name="inventoryType" Value="20"/> |
101 | <Key Name="currentPermissions" Value="2147483647"/> | ||
102 | <Key Name="nextPermissions" Value="2147483647"/> | ||
103 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
104 | <Key Name="basePermissions" Value="2147483647"/> | ||
105 | </Section> | 80 | </Section> |
81 | |||
106 | <Section Name="take it outside"> | 82 | <Section Name="take it outside"> |
107 | <Key Name="inventoryID" Value="1488b988-c300-4c2e-b48a-3b8eacb93659"/> | 83 | <Key Name="inventoryID" Value="1488b988-c300-4c2e-b48a-3b8eacb93659"/> |
108 | <Key Name="assetID" Value="d082bd28-f655-43b7-a0eb-cb80db03753e"/> | 84 | <Key Name="assetID" Value="d082bd28-f655-43b7-a0eb-cb80db03753e"/> |
@@ -111,11 +87,8 @@ | |||
111 | <Key Name="name" Value="take it outside" /> | 87 | <Key Name="name" Value="take it outside" /> |
112 | <Key Name="assetType" Value="21"/> | 88 | <Key Name="assetType" Value="21"/> |
113 | <Key Name="inventoryType" Value="20"/> | 89 | <Key Name="inventoryType" Value="20"/> |
114 | <Key Name="currentPermissions" Value="2147483647"/> | ||
115 | <Key Name="nextPermissions" Value="2147483647"/> | ||
116 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
117 | <Key Name="basePermissions" Value="2147483647"/> | ||
118 | </Section> | 90 | </Section> |
91 | |||
119 | <Section Name="whoohoo!"> | 92 | <Section Name="whoohoo!"> |
120 | <Key Name="inventoryID" Value="18c1a2fc-17f6-4af4-a519-827b272feaac"/> | 93 | <Key Name="inventoryID" Value="18c1a2fc-17f6-4af4-a519-827b272feaac"/> |
121 | <Key Name="assetID" Value="7f7384c0-848c-4bf0-8e83-50879981e1a4"/> | 94 | <Key Name="assetID" Value="7f7384c0-848c-4bf0-8e83-50879981e1a4"/> |
@@ -124,11 +97,8 @@ | |||
124 | <Key Name="name" Value="whoohoo!" /> | 97 | <Key Name="name" Value="whoohoo!" /> |
125 | <Key Name="assetType" Value="21"/> | 98 | <Key Name="assetType" Value="21"/> |
126 | <Key Name="inventoryType" Value="20"/> | 99 | <Key Name="inventoryType" Value="20"/> |
127 | <Key Name="currentPermissions" Value="2147483647"/> | ||
128 | <Key Name="nextPermissions" Value="2147483647"/> | ||
129 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
130 | <Key Name="basePermissions" Value="2147483647"/> | ||
131 | </Section> | 100 | </Section> |
101 | |||
132 | <Section Name="raise hand"> | 102 | <Section Name="raise hand"> |
133 | <Key Name="inventoryID" Value="5c0afacd-bbd0-4f66-a516-4ac4e380853c"/> | 103 | <Key Name="inventoryID" Value="5c0afacd-bbd0-4f66-a516-4ac4e380853c"/> |
134 | <Key Name="assetID" Value="2d0819cf-452b-4db8-b7ac-cda443bc89e7"/> | 104 | <Key Name="assetID" Value="2d0819cf-452b-4db8-b7ac-cda443bc89e7"/> |
@@ -137,11 +107,8 @@ | |||
137 | <Key Name="name" Value="raise hand" /> | 107 | <Key Name="name" Value="raise hand" /> |
138 | <Key Name="assetType" Value="21"/> | 108 | <Key Name="assetType" Value="21"/> |
139 | <Key Name="inventoryType" Value="20"/> | 109 | <Key Name="inventoryType" Value="20"/> |
140 | <Key Name="currentPermissions" Value="2147483647"/> | ||
141 | <Key Name="nextPermissions" Value="2147483647"/> | ||
142 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
143 | <Key Name="basePermissions" Value="2147483647"/> | ||
144 | </Section> | 110 | </Section> |
111 | |||
145 | <Section Name="LOL"> | 112 | <Section Name="LOL"> |
146 | <Key Name="inventoryID" Value="407f6a99-1a12-43c6-bec1-8fad974c8f42"/> | 113 | <Key Name="inventoryID" Value="407f6a99-1a12-43c6-bec1-8fad974c8f42"/> |
147 | <Key Name="assetID" Value="d545ac78-09cc-4811-8700-8df1a37d7f56"/> | 114 | <Key Name="assetID" Value="d545ac78-09cc-4811-8700-8df1a37d7f56"/> |
@@ -150,11 +117,8 @@ | |||
150 | <Key Name="name" Value="LOL" /> | 117 | <Key Name="name" Value="LOL" /> |
151 | <Key Name="assetType" Value="21"/> | 118 | <Key Name="assetType" Value="21"/> |
152 | <Key Name="inventoryType" Value="20"/> | 119 | <Key Name="inventoryType" Value="20"/> |
153 | <Key Name="currentPermissions" Value="2147483647"/> | ||
154 | <Key Name="nextPermissions" Value="2147483647"/> | ||
155 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
156 | <Key Name="basePermissions" Value="2147483647"/> | ||
157 | </Section> | 120 | </Section> |
121 | |||
158 | <Section Name="dance1"> | 122 | <Section Name="dance1"> |
159 | <Key Name="inventoryID" Value="59cce8ab-5c0c-49be-aa3b-036f05fbd7f4"/> | 123 | <Key Name="inventoryID" Value="59cce8ab-5c0c-49be-aa3b-036f05fbd7f4"/> |
160 | <Key Name="assetID" Value="9cc5bb24-bacf-44f9-a1d0-d409e6ccfa6c"/> | 124 | <Key Name="assetID" Value="9cc5bb24-bacf-44f9-a1d0-d409e6ccfa6c"/> |
@@ -163,11 +127,8 @@ | |||
163 | <Key Name="name" Value="dance1" /> | 127 | <Key Name="name" Value="dance1" /> |
164 | <Key Name="assetType" Value="21"/> | 128 | <Key Name="assetType" Value="21"/> |
165 | <Key Name="inventoryType" Value="20"/> | 129 | <Key Name="inventoryType" Value="20"/> |
166 | <Key Name="currentPermissions" Value="2147483647"/> | ||
167 | <Key Name="nextPermissions" Value="2147483647"/> | ||
168 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
169 | <Key Name="basePermissions" Value="2147483647"/> | ||
170 | </Section> | 130 | </Section> |
131 | |||
171 | <Section Name="wink!"> | 132 | <Section Name="wink!"> |
172 | <Key Name="inventoryID" Value="ba33e8ab-b816-4ead-9302-c8475deb1845"/> | 133 | <Key Name="inventoryID" Value="ba33e8ab-b816-4ead-9302-c8475deb1845"/> |
173 | <Key Name="assetID" Value="67d47cd0-9634-4c99-97db-ddce9bda467c"/> | 134 | <Key Name="assetID" Value="67d47cd0-9634-4c99-97db-ddce9bda467c"/> |
@@ -176,11 +137,8 @@ | |||
176 | <Key Name="name" Value="wink!" /> | 137 | <Key Name="name" Value="wink!" /> |
177 | <Key Name="assetType" Value="21"/> | 138 | <Key Name="assetType" Value="21"/> |
178 | <Key Name="inventoryType" Value="20"/> | 139 | <Key Name="inventoryType" Value="20"/> |
179 | <Key Name="currentPermissions" Value="2147483647"/> | ||
180 | <Key Name="nextPermissions" Value="2147483647"/> | ||
181 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
182 | <Key Name="basePermissions" Value="2147483647"/> | ||
183 | </Section> | 140 | </Section> |
141 | |||
184 | <Section Name="not sure"> | 142 | <Section Name="not sure"> |
185 | <Key Name="inventoryID" Value="02da80eb-cad0-4cd1-9ff7-d3d3dd150fbc"/> | 143 | <Key Name="inventoryID" Value="02da80eb-cad0-4cd1-9ff7-d3d3dd150fbc"/> |
186 | <Key Name="assetID" Value="9bc46cd2-95cb-456d-9070-a4439e42af9e"/> | 144 | <Key Name="assetID" Value="9bc46cd2-95cb-456d-9070-a4439e42af9e"/> |
@@ -189,11 +147,8 @@ | |||
189 | <Key Name="name" Value="not sure" /> | 147 | <Key Name="name" Value="not sure" /> |
190 | <Key Name="assetType" Value="21"/> | 148 | <Key Name="assetType" Value="21"/> |
191 | <Key Name="inventoryType" Value="20"/> | 149 | <Key Name="inventoryType" Value="20"/> |
192 | <Key Name="currentPermissions" Value="2147483647"/> | ||
193 | <Key Name="nextPermissions" Value="2147483647"/> | ||
194 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
195 | <Key Name="basePermissions" Value="2147483647"/> | ||
196 | </Section> | 150 | </Section> |
151 | |||
197 | <Section Name="dance3"> | 152 | <Section Name="dance3"> |
198 | <Key Name="inventoryID" Value="05e53736-dacb-4935-a1e9-d9897b35b962"/> | 153 | <Key Name="inventoryID" Value="05e53736-dacb-4935-a1e9-d9897b35b962"/> |
199 | <Key Name="assetID" Value="fd9ad83a-4921-4b6e-8b8e-558556d9f503"/> | 154 | <Key Name="assetID" Value="fd9ad83a-4921-4b6e-8b8e-558556d9f503"/> |
@@ -202,9 +157,6 @@ | |||
202 | <Key Name="name" Value="dance3" /> | 157 | <Key Name="name" Value="dance3" /> |
203 | <Key Name="assetType" Value="21"/> | 158 | <Key Name="assetType" Value="21"/> |
204 | <Key Name="inventoryType" Value="20"/> | 159 | <Key Name="inventoryType" Value="20"/> |
205 | <Key Name="currentPermissions" Value="2147483647"/> | ||
206 | <Key Name="nextPermissions" Value="2147483647"/> | ||
207 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
208 | <Key Name="basePermissions" Value="2147483647"/> | ||
209 | </Section> | 160 | </Section> |
161 | |||
210 | </Nini> | 162 | </Nini> |