Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

1 files changed, 13 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 45ca00c..e2ef77b 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -565,31 +565,37 @@ namespace OpenSim.Region.Framework.Scenes
         
         public string ToXml2()
         {
-            MemoryStream ms = new MemoryStream();
+            MemoryStream ms = new MemoryStream(512);
             UTF8Encoding enc = new UTF8Encoding();
-            XmlTextWriter writer = new XmlTextWriter(ms, null);
-            ToXml2(writer);
-            return enc.GetString(ms.ToArray());
+            XmlTextWriter xwriter = new XmlTextWriter(ms, enc);
+            ToXml2(xwriter);
+            xwriter.Flush();
+            string s = ms.GetStreamString();
+            xwriter.Close();
+            return s;
         }
 
         public static SOPVehicle FromXml2(string text)
         {
             if (text == String.Empty)
                 return null;
+
             UTF8Encoding enc = new UTF8Encoding();
             MemoryStream ms = new MemoryStream(enc.GetBytes(text));
-            XmlTextReader reader = new XmlTextReader(ms);
+            XmlTextReader xreader = new XmlTextReader(ms);
 
             SOPVehicle v = new SOPVehicle();
             bool error;
 
-            v.FromXml2(reader, out error);
+            v.FromXml2(xreader, out error);
+
+            xreader.Close();
+
             if (error)
             {
                 v = null;
                 return null;
             }
-
             return v;
         }