diff options
Diffstat (limited to 'OpenSim/Framework/LLSDxmlEncode.cs')
-rw-r--r-- | OpenSim/Framework/LLSDxmlEncode.cs | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Framework/LLSDxmlEncode.cs b/OpenSim/Framework/LLSDxmlEncode.cs index 102955d..5074f05 100644 --- a/OpenSim/Framework/LLSDxmlEncode.cs +++ b/OpenSim/Framework/LLSDxmlEncode.cs | |||
@@ -176,96 +176,96 @@ namespace OpenSim.Framework | |||
176 | 176 | ||
177 | public static void AddElem(Vector2 e, StringBuilder sb) | 177 | public static void AddElem(Vector2 e, StringBuilder sb) |
178 | { | 178 | { |
179 | sb.Append("<map><key>x</key>"); | 179 | sb.Append("<array>"); |
180 | 180 | ||
181 | if(e.X == 0) | 181 | if(e.X == 0) |
182 | sb.Append("<real /><key>y</key>"); | 182 | sb.Append("<real />"); |
183 | else | 183 | else |
184 | { | 184 | { |
185 | sb.Append("<real>"); | 185 | sb.Append("<real>"); |
186 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); | 186 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); |
187 | sb.Append("</real><key>y</key>"); | 187 | sb.Append("</real>"); |
188 | } | 188 | } |
189 | 189 | ||
190 | if(e.Y == 0) | 190 | if(e.Y == 0) |
191 | sb.Append("<real /></map>"); | 191 | sb.Append("<real /></array>"); |
192 | else | 192 | else |
193 | { | 193 | { |
194 | sb.Append("<real>"); | 194 | sb.Append("<real>"); |
195 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); | 195 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); |
196 | sb.Append("</real></map>"); | 196 | sb.Append("</real></array>"); |
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
200 | public static void AddElem(Vector3 e, StringBuilder sb) | 200 | public static void AddElem(Vector3 e, StringBuilder sb) |
201 | { | 201 | { |
202 | sb.Append("<map>key>x</key>"); | 202 | sb.Append("<array>"); |
203 | 203 | ||
204 | if(e.X == 0) | 204 | if(e.X == 0) |
205 | sb.Append("<real /><key>y</key>"); | 205 | sb.Append("<real />"); |
206 | else | 206 | else |
207 | { | 207 | { |
208 | sb.Append("<real>"); | 208 | sb.Append("<real>"); |
209 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); | 209 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); |
210 | sb.Append("</real><key>y</key>"); | 210 | sb.Append("</real>"); |
211 | } | 211 | } |
212 | 212 | ||
213 | if(e.Y == 0) | 213 | if(e.Y == 0) |
214 | sb.Append("<real /><key>z</key>"); | 214 | sb.Append("<real />"); |
215 | else | 215 | else |
216 | { | 216 | { |
217 | sb.Append("<real>"); | 217 | sb.Append("<real>"); |
218 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); | 218 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); |
219 | sb.Append("</real><key>z</key>"); | 219 | sb.Append("</real>"); |
220 | } | 220 | } |
221 | 221 | ||
222 | if(e.Z == 0) | 222 | if(e.Z == 0) |
223 | sb.Append("<real /></map>"); | 223 | sb.Append("<real /></array>"); |
224 | else | 224 | else |
225 | { | 225 | { |
226 | sb.Append("<real>"); | 226 | sb.Append("<real>"); |
227 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); | 227 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); |
228 | sb.Append("</real></map>"); | 228 | sb.Append("</real></array>"); |
229 | } | 229 | } |
230 | } | 230 | } |
231 | 231 | ||
232 | public static void AddElem(Quaternion e, StringBuilder sb) | 232 | public static void AddElem(Quaternion e, StringBuilder sb) |
233 | { | 233 | { |
234 | sb.Append("<map><key>x</key>"); | 234 | sb.Append("<array><key>x</key>"); |
235 | 235 | ||
236 | if(e.X == 0) | 236 | if(e.X == 0) |
237 | sb.Append("<real /><key>y</key>"); | 237 | sb.Append("<real />"); |
238 | else | 238 | else |
239 | { | 239 | { |
240 | sb.Append("<real>"); | 240 | sb.Append("<real>"); |
241 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); | 241 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); |
242 | sb.Append("</real><key>y</key>"); | 242 | sb.Append("</real>"); |
243 | } | 243 | } |
244 | 244 | ||
245 | if(e.Y == 0) | 245 | if(e.Y == 0) |
246 | sb.Append("<real /><key>z</key>"); | 246 | sb.Append("<real />"); |
247 | else | 247 | else |
248 | { | 248 | { |
249 | sb.Append("<real>"); | 249 | sb.Append("<real>"); |
250 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); | 250 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); |
251 | sb.Append("</real><key>z</key>"); | 251 | sb.Append("</real>"); |
252 | } | 252 | } |
253 | if(e.Z == 0) | 253 | if(e.Z == 0) |
254 | sb.Append("<real /><key>w</key>"); | 254 | sb.Append("<real />"); |
255 | else | 255 | else |
256 | { | 256 | { |
257 | sb.Append("<real>"); | 257 | sb.Append("<real>"); |
258 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); | 258 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); |
259 | sb.Append("</real><key>w</key>"); | 259 | sb.Append("</real>"); |
260 | } | 260 | } |
261 | 261 | ||
262 | if(e.W == 0) | 262 | if(e.W == 0) |
263 | sb.Append("<real /></map>"); | 263 | sb.Append("<real /></array>"); |
264 | else | 264 | else |
265 | { | 265 | { |
266 | sb.Append("<real>"); | 266 | sb.Append("<real>"); |
267 | sb.Append(e.W.ToString(CultureInfo.InvariantCulture)); | 267 | sb.Append(e.W.ToString(CultureInfo.InvariantCulture)); |
268 | sb.Append("</real></map>"); | 268 | sb.Append("</real></array>"); |
269 | } | 269 | } |
270 | } | 270 | } |
271 | 271 | ||
@@ -491,24 +491,24 @@ namespace OpenSim.Framework | |||
491 | { | 491 | { |
492 | sb.Append("<key>"); | 492 | sb.Append("<key>"); |
493 | sb.Append(name); | 493 | sb.Append(name); |
494 | sb.Append("</key><map><key>x</key>"); | 494 | sb.Append("</key><array>>"); |
495 | 495 | ||
496 | if(e.X == 0) | 496 | if(e.X == 0) |
497 | sb.Append("<real /><key>y</key>"); | 497 | sb.Append("<real />"); |
498 | else | 498 | else |
499 | { | 499 | { |
500 | sb.Append("<real>"); | 500 | sb.Append("<real>"); |
501 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); | 501 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); |
502 | sb.Append("</real><key>y</key>"); | 502 | sb.Append("</real>"); |
503 | } | 503 | } |
504 | 504 | ||
505 | if(e.Y == 0) | 505 | if(e.Y == 0) |
506 | sb.Append("<real /></map>"); | 506 | sb.Append("<real /></array>"); |
507 | else | 507 | else |
508 | { | 508 | { |
509 | sb.Append("<real>"); | 509 | sb.Append("<real>"); |
510 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); | 510 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); |
511 | sb.Append("</real></map>"); | 511 | sb.Append("</real></array>"); |
512 | } | 512 | } |
513 | } | 513 | } |
514 | 514 | ||
@@ -516,33 +516,33 @@ namespace OpenSim.Framework | |||
516 | { | 516 | { |
517 | sb.Append("<key>"); | 517 | sb.Append("<key>"); |
518 | sb.Append(name); | 518 | sb.Append(name); |
519 | sb.Append("</key><map>key>x</key>"); | 519 | sb.Append("</key><array>"); |
520 | 520 | ||
521 | if(e.X == 0) | 521 | if(e.X == 0) |
522 | sb.Append("<real /><key>y</key>"); | 522 | sb.Append("<real />"); |
523 | else | 523 | else |
524 | { | 524 | { |
525 | sb.Append("<real>"); | 525 | sb.Append("<real>"); |
526 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); | 526 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); |
527 | sb.Append("</real><key>y</key>"); | 527 | sb.Append("</real>"); |
528 | } | 528 | } |
529 | 529 | ||
530 | if(e.Y == 0) | 530 | if(e.Y == 0) |
531 | sb.Append("<real /><key>z</key>"); | 531 | sb.Append("<real />"); |
532 | else | 532 | else |
533 | { | 533 | { |
534 | sb.Append("<real>"); | 534 | sb.Append("<real>"); |
535 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); | 535 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); |
536 | sb.Append("</real><key>z</key>"); | 536 | sb.Append("</real>"); |
537 | } | 537 | } |
538 | 538 | ||
539 | if(e.Z == 0) | 539 | if(e.Z == 0) |
540 | sb.Append("<real /></map>"); | 540 | sb.Append("<real /></array>"); |
541 | else | 541 | else |
542 | { | 542 | { |
543 | sb.Append("<real>"); | 543 | sb.Append("<real>"); |
544 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); | 544 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); |
545 | sb.Append("</real></map>"); | 545 | sb.Append("</real></array>"); |
546 | } | 546 | } |
547 | } | 547 | } |
548 | 548 | ||
@@ -550,41 +550,41 @@ namespace OpenSim.Framework | |||
550 | { | 550 | { |
551 | sb.Append("<key>"); | 551 | sb.Append("<key>"); |
552 | sb.Append(name); | 552 | sb.Append(name); |
553 | sb.Append("</key><map><key>x</key>"); | 553 | sb.Append("</key><array>"); |
554 | 554 | ||
555 | if(e.X == 0) | 555 | if(e.X == 0) |
556 | sb.Append("<real /><key>y</key>"); | 556 | sb.Append("<real />"); |
557 | else | 557 | else |
558 | { | 558 | { |
559 | sb.Append("<real>"); | 559 | sb.Append("<real>"); |
560 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); | 560 | sb.Append(e.X.ToString(CultureInfo.InvariantCulture)); |
561 | sb.Append("</real><key>y</key>"); | 561 | sb.Append("</real>"); |
562 | } | 562 | } |
563 | 563 | ||
564 | if(e.Y == 0) | 564 | if(e.Y == 0) |
565 | sb.Append("<real /><key>z</key>"); | 565 | sb.Append("<real />"); |
566 | else | 566 | else |
567 | { | 567 | { |
568 | sb.Append("<real>"); | 568 | sb.Append("<real>"); |
569 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); | 569 | sb.Append(e.Y.ToString(CultureInfo.InvariantCulture)); |
570 | sb.Append("</real><key>z</key>"); | 570 | sb.Append("</real>"); |
571 | } | 571 | } |
572 | if(e.Z == 0) | 572 | if(e.Z == 0) |
573 | sb.Append("<real /><key>w</key>"); | 573 | sb.Append("<real />"); |
574 | else | 574 | else |
575 | { | 575 | { |
576 | sb.Append("<real>"); | 576 | sb.Append("<real>"); |
577 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); | 577 | sb.Append(e.Z.ToString(CultureInfo.InvariantCulture)); |
578 | sb.Append("</real><key>w</key>"); | 578 | sb.Append("</real>"); |
579 | } | 579 | } |
580 | 580 | ||
581 | if(e.W == 0) | 581 | if(e.W == 0) |
582 | sb.Append("<real /></map>"); | 582 | sb.Append("<real /></array>"); |
583 | else | 583 | else |
584 | { | 584 | { |
585 | sb.Append("<real>"); | 585 | sb.Append("<real>"); |
586 | sb.Append(e.W.ToString(CultureInfo.InvariantCulture)); | 586 | sb.Append(e.W.ToString(CultureInfo.InvariantCulture)); |
587 | sb.Append("</real></map>"); | 587 | sb.Append("</real></array>"); |
588 | } | 588 | } |
589 | } | 589 | } |
590 | 590 | ||