aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SOPVehicle.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SOPVehicle.cs25
1 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 9cb901a..b617f52 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -487,7 +487,7 @@ namespace OpenSim.Region.Framework.Scenes
487 487
488 488
489 489
490 XmlTextReader reader; 490 XmlReader reader;
491 491
492 private int XRint() 492 private int XRint()
493 { 493 {
@@ -524,7 +524,7 @@ namespace OpenSim.Region.Framework.Scenes
524 524
525 public static bool EReadProcessors( 525 public static bool EReadProcessors(
526 Dictionary<string, Action> processors, 526 Dictionary<string, Action> processors,
527 XmlTextReader xtr) 527 XmlReader xtr)
528 { 528 {
529 bool errors = false; 529 bool errors = false;
530 530
@@ -564,14 +564,15 @@ namespace OpenSim.Region.Framework.Scenes
564 564
565 public string ToXml2() 565 public string ToXml2()
566 { 566 {
567 MemoryStream ms = new MemoryStream(512); 567 using (StringWriter sw = new StringWriter())
568 UTF8Encoding enc = new UTF8Encoding(); 568 {
569 XmlTextWriter xwriter = new XmlTextWriter(ms, enc); 569 using (XmlTextWriter xwriter = new XmlTextWriter(sw))
570 ToXml2(xwriter); 570 {
571 xwriter.Flush(); 571 ToXml2(xwriter);
572 string s = ms.GetStreamString(); 572 }
573 xwriter.Close(); 573
574 return s; 574 return sw.ToString();
575 }
575 } 576 }
576 577
577 public static SOPVehicle FromXml2(string text) 578 public static SOPVehicle FromXml2(string text)
@@ -598,7 +599,7 @@ namespace OpenSim.Region.Framework.Scenes
598 return v; 599 return v;
599 } 600 }
600 601
601 public static SOPVehicle FromXml2(XmlTextReader reader) 602 public static SOPVehicle FromXml2(XmlReader reader)
602 { 603 {
603 SOPVehicle vehicle = new SOPVehicle(); 604 SOPVehicle vehicle = new SOPVehicle();
604 605
@@ -611,7 +612,7 @@ namespace OpenSim.Region.Framework.Scenes
611 return vehicle; 612 return vehicle;
612 } 613 }
613 614
614 private void FromXml2(XmlTextReader _reader, out bool errors) 615 private void FromXml2(XmlReader _reader, out bool errors)
615 { 616 {
616 errors = false; 617 errors = false;
617 reader = _reader; 618 reader = _reader;