6 files changed, 330 insertions, 330 deletions

diff --git a/OpenSim/Framework/IRegionLoader.cs b/OpenSim/Framework/IRegionLoader.cs
index 516a886..078a0f5 100644
--- a/OpenSim/Framework/IRegionLoader.cs
+++ b/OpenSim/Framework/IRegionLoader.cs
@@ -1,41 +1,41 @@
-/*

-* Copyright (c) Contributors, http://opensimulator.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-

-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework;

-using Nini.Config;

-namespace OpenSim.Framework

-{

-    public interface IRegionLoader

-    {

-        void SetIniConfigSource(IniConfigSource configSource);

-        RegionInfo[] LoadRegions();

-    }

-}

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework;
+using Nini.Config;
+namespace OpenSim.Framework
+{
+    public interface IRegionLoader
+    {
+        void SetIniConfigSource(IniConfigSource configSource);
+        RegionInfo[] LoadRegions();
+    }
+}
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 5ebcb64..7179a7f 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -1,72 +1,72 @@
-/*

-* Copyright (c) Contributors, http://opensimulator.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-using Nini.Config;

-using OpenSim.Framework;

-using System.IO;

-

-namespace OpenSim.Framework.RegionLoader.Filesystem

-{

-    public class RegionLoaderFileSystem : IRegionLoader

-    {

-        public void SetIniConfigSource(IniConfigSource configSource)

-        {

-        }

-        public RegionInfo[] LoadRegions()

-        {

-            string regionConfigPath = Path.Combine(Util.configDir(), "Regions");

-

-            if (!Directory.Exists(regionConfigPath))

-            {

-                Directory.CreateDirectory(regionConfigPath);

-            }

-

-            string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");

-

-            if (configFiles.Length == 0)

-            {

-                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"));

-                configFiles = Directory.GetFiles(regionConfigPath, "*.xml");

-            }

-

-            RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];

-            for (int i = 0; i < configFiles.Length; i++)

-            {

-

-                RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]);

-                regionInfos[i] = regionInfo;

-            }

-

-

-            return regionInfos;

-        }

-

-    }

-}

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Nini.Config;
+using OpenSim.Framework;
+using System.IO;
+
+namespace OpenSim.Framework.RegionLoader.Filesystem
+{
+    public class RegionLoaderFileSystem : IRegionLoader
+    {
+        public void SetIniConfigSource(IniConfigSource configSource)
+        {
+        }
+        public RegionInfo[] LoadRegions()
+        {
+            string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
+
+            if (!Directory.Exists(regionConfigPath))
+            {
+                Directory.CreateDirectory(regionConfigPath);
+            }
+
+            string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
+
+            if (configFiles.Length == 0)
+            {
+                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"));
+                configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
+            }
+
+            RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
+            for (int i = 0; i < configFiles.Length; i++)
+            {
+
+                RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]);
+                regionInfos[i] = regionInfo;
+            }
+
+
+            return regionInfos;
+        }
+
+    }
+}
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 6a52a43..f7835e3 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -1,98 +1,98 @@
-/*

-* Copyright (c) Contributors, http://opensimulator.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Net;

-using System.IO;

-using System.Xml;

-using System.Collections.Generic;

-using System.Text;

-using Nini.Config;

-using OpenSim.Framework;

-

-namespace OpenSim.Framework.RegionLoader.Web

-{

-    public class RegionLoaderWebServer : IRegionLoader

-    {

-        private IniConfigSource m_configSouce;

-        public void SetIniConfigSource(IniConfigSource configSource)

-        {

-            m_configSouce = configSource;

-        }

-        public RegionInfo[] LoadRegions()

-        {

-            if (m_configSouce == null)

-            {

-                Console.MainLog.Instance.Error("Unable to load configuration source! (WebServer Region Loader)");

-                return null;

-            }

-            else

-            {

-                IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"];

-                string url = startupConfig.GetString("regionload_webserver_url","").Trim();

-                if (url == "")

-                {

-                    Console.MainLog.Instance.Error("Unable to load webserver URL - URL was empty (WebServer Region Loader");

-                    return null;

-                }

-                else

-                {

-                    

-                    HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);

-                    webRequest.Timeout = 30000; //30 Second Timeout

-                    Console.MainLog.Instance.Debug("Sending Download Request...");

-                    HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();

-                    Console.MainLog.Instance.Debug("Downloading Region Information From Remote Server...");

-                    StreamReader reader = new StreamReader(webResponse.GetResponseStream());

-                    string xmlSource = "";

-                    string tempStr = reader.ReadLine();

-                    while (tempStr != null)

-                    {

-                        xmlSource = xmlSource + tempStr;

-                        tempStr = reader.ReadLine();

-                    }

-                    Console.MainLog.Instance.Debug("Done downloading region information from server. Total Bytes: " + xmlSource.Length);

-                    XmlDocument xmlDoc = new XmlDocument();

-                    xmlDoc.LoadXml(xmlSource);

-                    if (xmlDoc.FirstChild.Name == "Regions")

-                    {

-                        RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count];

-                        int i;

-                        for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)

-                        {

-                            Console.MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);

-                            regionInfos[i] = new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]);

-                        }

-

-                        return regionInfos;

-                    }

-                    return null;

-                }

-            }

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Net;
+using System.IO;
+using System.Xml;
+using System.Collections.Generic;
+using System.Text;
+using Nini.Config;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework.RegionLoader.Web
+{
+    public class RegionLoaderWebServer : IRegionLoader
+    {
+        private IniConfigSource m_configSouce;
+        public void SetIniConfigSource(IniConfigSource configSource)
+        {
+            m_configSouce = configSource;
+        }
+        public RegionInfo[] LoadRegions()
+        {
+            if (m_configSouce == null)
+            {
+                Console.MainLog.Instance.Error("Unable to load configuration source! (WebServer Region Loader)");
+                return null;
+            }
+            else
+            {
+                IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"];
+                string url = startupConfig.GetString("regionload_webserver_url","").Trim();
+                if (url == "")
+                {
+                    Console.MainLog.Instance.Error("Unable to load webserver URL - URL was empty (WebServer Region Loader");
+                    return null;
+                }
+                else
+                {
+                    
+                    HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
+                    webRequest.Timeout = 30000; //30 Second Timeout
+                    Console.MainLog.Instance.Debug("Sending Download Request...");
+                    HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
+                    Console.MainLog.Instance.Debug("Downloading Region Information From Remote Server...");
+                    StreamReader reader = new StreamReader(webResponse.GetResponseStream());
+                    string xmlSource = "";
+                    string tempStr = reader.ReadLine();
+                    while (tempStr != null)
+                    {
+                        xmlSource = xmlSource + tempStr;
+                        tempStr = reader.ReadLine();
+                    }
+                    Console.MainLog.Instance.Debug("Done downloading region information from server. Total Bytes: " + xmlSource.Length);
+                    XmlDocument xmlDoc = new XmlDocument();
+                    xmlDoc.LoadXml(xmlSource);
+                    if (xmlDoc.FirstChild.Name == "Regions")
+                    {
+                        RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count];
+                        int i;
+                        for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                        {
+                            Console.MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                            regionInfos[i] = new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]);
+                        }
+
+                        return regionInfos;
+                    }
+                    return null;
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/BaseRequestHandler.cs b/OpenSim/Framework/Servers/BaseRequestHandler.cs
index b357763..155a283 100644
--- a/OpenSim/Framework/Servers/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/BaseRequestHandler.cs
@@ -1,35 +1,35 @@
-namespace OpenSim.Framework.Servers

-{

-    public class BaseRequestHandler

-    {

-        public virtual string ContentType

-        {

-            get { return "application/xml"; }

-        }

-

-        private readonly string m_httpMethod;

-

-        public virtual string HttpMethod

-        {

-            get { return m_httpMethod; }

-        }

-

-        private readonly string m_path;

-

-        protected BaseRequestHandler(string httpMethod, string path)

-        {

-            m_httpMethod = httpMethod;

-            m_path = path;

-        }

-

-        public virtual string Path

-        {

-            get { return m_path; }

-        }

-

-        protected string GetParam(string path)

-        {

-            return path.Substring(m_path.Length);

-        }

-    }

+namespace OpenSim.Framework.Servers
+{
+    public class BaseRequestHandler
+    {
+        public virtual string ContentType
+        {
+            get { return "application/xml"; }
+        }
+
+        private readonly string m_httpMethod;
+
+        public virtual string HttpMethod
+        {
+            get { return m_httpMethod; }
+        }
+
+        private readonly string m_path;
+
+        protected BaseRequestHandler(string httpMethod, string path)
+        {
+            m_httpMethod = httpMethod;
+            m_path = path;
+        }
+
+        public virtual string Path
+        {
+            get { return m_path; }
+        }
+
+        protected string GetParam(string path)
+        {
+            return path.Substring(m_path.Length);
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index adf5c3f..a47d3d3 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -1,38 +1,38 @@
-using System.IO;

-using System.Xml;

-using System.Xml.Serialization;

-

-namespace OpenSim.Framework.Servers

-{

-    public delegate TResponse RestDeserialiseMethod<TRequest, TResponse>(TRequest request);

-

-    public class RestDeserialisehandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler

-        where TRequest : new()

-    {

-        private RestDeserialiseMethod<TRequest, TResponse> m_method;

-

-        public RestDeserialisehandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)

-            : base(httpMethod, path)

-        {

-            m_method = method;

-        }

-

-        public void Handle(string path, Stream request, Stream responseStream)

-        {

-            TRequest deserial;

-            using (XmlTextReader xmlReader = new XmlTextReader(request))

-            {

-                XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));

-                deserial = (TRequest) deserializer.Deserialize(xmlReader);

-            }

-

-            TResponse response = m_method(deserial);

-

-            using (XmlWriter xmlWriter = XmlTextWriter.Create(responseStream))

-            {

-                XmlSerializer serializer = new XmlSerializer(typeof (TResponse));

-                serializer.Serialize(xmlWriter, response);

-            }

-        }

-    }

+using System.IO;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace OpenSim.Framework.Servers
+{
+    public delegate TResponse RestDeserialiseMethod<TRequest, TResponse>(TRequest request);
+
+    public class RestDeserialisehandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
+        where TRequest : new()
+    {
+        private RestDeserialiseMethod<TRequest, TResponse> m_method;
+
+        public RestDeserialisehandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)
+            : base(httpMethod, path)
+        {
+            m_method = method;
+        }
+
+        public void Handle(string path, Stream request, Stream responseStream)
+        {
+            TRequest deserial;
+            using (XmlTextReader xmlReader = new XmlTextReader(request))
+            {
+                XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
+                deserial = (TRequest) deserializer.Deserialize(xmlReader);
+            }
+
+            TResponse response = m_method(deserial);
+
+            using (XmlWriter xmlWriter = XmlTextWriter.Create(responseStream))
+            {
+                XmlSerializer serializer = new XmlSerializer(typeof (TResponse));
+                serializer.Serialize(xmlWriter, response);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/RestObjectPoster.cs b/OpenSim/Framework/Servers/RestObjectPoster.cs
index 77660a0..b77cbcc 100644
--- a/OpenSim/Framework/Servers/RestObjectPoster.cs
+++ b/OpenSim/Framework/Servers/RestObjectPoster.cs
@@ -1,49 +1,49 @@
-using System;

-using System.IO;

-using System.Net;

-using System.Text;

-using System.Xml;

-using System.Xml.Serialization;

-

-

-namespace OpenSim.Framework.Servers

-{

-    public class RestObjectPoster

-    {

-        public static void BeginPostObject<TRequest>(string requestUrl, TRequest obj)

-        {

-            Type type = typeof(TRequest);

-

-            WebRequest request = WebRequest.Create(requestUrl);

-            request.Method = "POST";

-            request.ContentType = "text/xml";

-

-            MemoryStream buffer = new MemoryStream();

-

-            XmlWriterSettings settings = new XmlWriterSettings();

-            settings.Encoding = Encoding.UTF8;

-

-            using (XmlWriter writer = XmlWriter.Create(buffer, settings))

-            {

-                XmlSerializer serializer = new XmlSerializer(type);

-                serializer.Serialize(writer, obj);

-                writer.Flush();

-            }

-

-            int length = (int)buffer.Length;

-            request.ContentLength = length;

-

-            Stream requestStream = request.GetRequestStream();

-            requestStream.Write(buffer.ToArray(), 0, length);

-            IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);

-        }

-

-        private static void AsyncCallback(IAsyncResult result)

-        {

-            WebRequest request = (WebRequest)result.AsyncState;

-            using (WebResponse resp = request.EndGetResponse(result))

-            {

-            }

-        }

-    }

+using System;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+
+
+namespace OpenSim.Framework.Servers
+{
+    public class RestObjectPoster
+    {
+        public static void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
+        {
+            Type type = typeof(TRequest);
+
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = "POST";
+            request.ContentType = "text/xml";
+
+            MemoryStream buffer = new MemoryStream();
+
+            XmlWriterSettings settings = new XmlWriterSettings();
+            settings.Encoding = Encoding.UTF8;
+
+            using (XmlWriter writer = XmlWriter.Create(buffer, settings))
+            {
+                XmlSerializer serializer = new XmlSerializer(type);
+                serializer.Serialize(writer, obj);
+                writer.Flush();
+            }
+
+            int length = (int)buffer.Length;
+            request.ContentLength = length;
+
+            Stream requestStream = request.GetRequestStream();
+            requestStream.Write(buffer.ToArray(), 0, length);
+            IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
+        }
+
+        private static void AsyncCallback(IAsyncResult result)
+        {
+            WebRequest request = (WebRequest)result.AsyncState;
+            using (WebResponse resp = request.EndGetResponse(result))
+            {
+            }
+        }
+    }
 }
\ No newline at end of file