changed to native line ending encoding

9 files changed, 643 insertions, 643 deletions

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index f790477..4b3b3de 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -1,224 +1,224 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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;

-using System.Collections.Generic;

-using System.IO;

-using System.Net;

-using System.Text;

-using System.Text.RegularExpressions;

-using System.Threading;

-using Nwc.XmlRpc;

-using OpenSim.Framework.Console;

-

-namespace OpenSim.Framework.Servers

-{

-    public class BaseHttpServer

-    {

-        protected Thread m_workerThread;

-        protected HttpListener m_httpListener;

-        protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();

-        protected Dictionary<string, IStreamHandler> m_streamHandlers = new Dictionary<string, IStreamHandler>();

-        protected int m_port;

-        protected bool m_firstcaps = true;

-

-        public BaseHttpServer(int port)

-        {

-            m_port = port;

-        }

-

-        public void AddStreamHandler( IStreamHandler handler)

-        {

-            string httpMethod = handler.HttpMethod;

-            string path = handler.Path;

-            

-            string handlerKey = GetHandlerKey(httpMethod, path);

-            m_streamHandlers.Add(handlerKey, handler);

-        }

-

-        private static string GetHandlerKey(string httpMethod, string path)

-        {

-            return httpMethod + ":" + path;

-        }

-

-        public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)

-        {

-            if (!this.m_rpcHandlers.ContainsKey(method))

-            {

-                this.m_rpcHandlers.Add(method, handler);

-                return true;

-            }

-

-            //must already have a handler for that path so return false

-            return false;

-        }

-

-

-        public virtual void HandleRequest(Object stateinfo)

-        {

-            HttpListenerContext context = (HttpListenerContext)stateinfo;

-

-            HttpListenerRequest request = context.Request;

-            HttpListenerResponse response = context.Response;

-

-            response.KeepAlive = false;

-            response.SendChunked = false;

-

-            string path = request.RawUrl;

-            string handlerKey = GetHandlerKey( request.HttpMethod, path );

-

-            IStreamHandler streamHandler;

-

-            if (TryGetStreamHandler( handlerKey, out streamHandler))

-            {

-                byte[] buffer = streamHandler.Handle(path, request.InputStream);

-                request.InputStream.Close();

-

-                response.ContentType = streamHandler.ContentType;

-                response.ContentLength64 = buffer.LongLength;

-                response.OutputStream.Write(buffer, 0, buffer.Length);

-                response.OutputStream.Close();

-            }

-            else

-            {

-                HandleXmlRpcRequests(request, response);

-            }

-        }

-

-        private bool TryGetStreamHandler(string handlerKey, out IStreamHandler streamHandler)

-        {

-            string bestMatch = null;

-

-            foreach (string pattern in m_streamHandlers.Keys)

-            {

-                if (handlerKey.StartsWith(pattern))

-                {

-                    if (String.IsNullOrEmpty(bestMatch) || pattern.Length > bestMatch.Length)

-                    {

-                        bestMatch = pattern;

-                    }

-                }

-            }

-

-            if (String.IsNullOrEmpty(bestMatch))

-            {

-                streamHandler = null;

-                return false;

-            }

-            else

-            {

-                streamHandler = m_streamHandlers[bestMatch];

-                return true;

-            }

-        }

-

-        private void HandleXmlRpcRequests(HttpListenerRequest request, HttpListenerResponse response)

-        {

-            Stream requestStream = request.InputStream;

-

-            Encoding encoding = Encoding.UTF8;

-            StreamReader reader = new StreamReader(requestStream, encoding);

-

-            string requestBody = reader.ReadToEnd();

-            reader.Close();

-            requestStream.Close();

-

-            XmlRpcRequest xmlRprcRequest = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);

-

-            string methodName = xmlRprcRequest.MethodName;

-

-            XmlRpcResponse xmlRpcResponse;

-

-            XmlRpcMethod method;

-            if (this.m_rpcHandlers.TryGetValue(methodName, out method))

-            {

-                xmlRpcResponse = method(xmlRprcRequest);

-            }

-            else

-            {

-                xmlRpcResponse = new XmlRpcResponse();

-                Hashtable unknownMethodError = new Hashtable();

-                unknownMethodError["reason"] = "XmlRequest"; ;

-                unknownMethodError["message"] = "Unknown Rpc Request ["+methodName+"]";

-                unknownMethodError["login"] = "false";

-                xmlRpcResponse.Value = unknownMethodError;

-            }

-

-            response.AddHeader("Content-type", "text/xml");

-

-            string responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);

-            

-            byte[] buffer = Encoding.UTF8.GetBytes(responseString);

-

-            response.SendChunked = false;

-            response.ContentLength64 = buffer.Length;

-            response.ContentEncoding = Encoding.UTF8;

-

-            response.OutputStream.Write(buffer, 0, buffer.Length);

-            response.OutputStream.Close();

-        }

-

-        public void Start()

-        {

-            MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");

-

-            m_workerThread = new Thread(new ThreadStart(StartHTTP));

-            m_workerThread.IsBackground = true;

-            m_workerThread.Start();

-        }

-

-        private void StartHTTP()

-        {

-            try

-            {

-                MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");

-                m_httpListener = new HttpListener();

-

-                m_httpListener.Prefixes.Add("http://+:" + m_port + "/");

-                m_httpListener.Start();

-

-                HttpListenerContext context;

-                while (true)

-                {

-                    context = m_httpListener.GetContext();

-                    ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);

-                }

-            }

-            catch (Exception e)

-            {

-                MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);

-            }

-        }

-

-

-        public void RemoveStreamHandler(string httpMethod, string path)

-        {

-            m_streamHandlers.Remove(GetHandlerKey(httpMethod, path));

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Framework.Servers
+{
+    public class BaseHttpServer
+    {
+        protected Thread m_workerThread;
+        protected HttpListener m_httpListener;
+        protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
+        protected Dictionary<string, IStreamHandler> m_streamHandlers = new Dictionary<string, IStreamHandler>();
+        protected int m_port;
+        protected bool m_firstcaps = true;
+
+        public BaseHttpServer(int port)
+        {
+            m_port = port;
+        }
+
+        public void AddStreamHandler( IStreamHandler handler)
+        {
+            string httpMethod = handler.HttpMethod;
+            string path = handler.Path;
+            
+            string handlerKey = GetHandlerKey(httpMethod, path);
+            m_streamHandlers.Add(handlerKey, handler);
+        }
+
+        private static string GetHandlerKey(string httpMethod, string path)
+        {
+            return httpMethod + ":" + path;
+        }
+
+        public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
+        {
+            if (!this.m_rpcHandlers.ContainsKey(method))
+            {
+                this.m_rpcHandlers.Add(method, handler);
+                return true;
+            }
+
+            //must already have a handler for that path so return false
+            return false;
+        }
+
+
+        public virtual void HandleRequest(Object stateinfo)
+        {
+            HttpListenerContext context = (HttpListenerContext)stateinfo;
+
+            HttpListenerRequest request = context.Request;
+            HttpListenerResponse response = context.Response;
+
+            response.KeepAlive = false;
+            response.SendChunked = false;
+
+            string path = request.RawUrl;
+            string handlerKey = GetHandlerKey( request.HttpMethod, path );
+
+            IStreamHandler streamHandler;
+
+            if (TryGetStreamHandler( handlerKey, out streamHandler))
+            {
+                byte[] buffer = streamHandler.Handle(path, request.InputStream);
+                request.InputStream.Close();
+
+                response.ContentType = streamHandler.ContentType;
+                response.ContentLength64 = buffer.LongLength;
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+                response.OutputStream.Close();
+            }
+            else
+            {
+                HandleXmlRpcRequests(request, response);
+            }
+        }
+
+        private bool TryGetStreamHandler(string handlerKey, out IStreamHandler streamHandler)
+        {
+            string bestMatch = null;
+
+            foreach (string pattern in m_streamHandlers.Keys)
+            {
+                if (handlerKey.StartsWith(pattern))
+                {
+                    if (String.IsNullOrEmpty(bestMatch) || pattern.Length > bestMatch.Length)
+                    {
+                        bestMatch = pattern;
+                    }
+                }
+            }
+
+            if (String.IsNullOrEmpty(bestMatch))
+            {
+                streamHandler = null;
+                return false;
+            }
+            else
+            {
+                streamHandler = m_streamHandlers[bestMatch];
+                return true;
+            }
+        }
+
+        private void HandleXmlRpcRequests(HttpListenerRequest request, HttpListenerResponse response)
+        {
+            Stream requestStream = request.InputStream;
+
+            Encoding encoding = Encoding.UTF8;
+            StreamReader reader = new StreamReader(requestStream, encoding);
+
+            string requestBody = reader.ReadToEnd();
+            reader.Close();
+            requestStream.Close();
+
+            XmlRpcRequest xmlRprcRequest = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
+
+            string methodName = xmlRprcRequest.MethodName;
+
+            XmlRpcResponse xmlRpcResponse;
+
+            XmlRpcMethod method;
+            if (this.m_rpcHandlers.TryGetValue(methodName, out method))
+            {
+                xmlRpcResponse = method(xmlRprcRequest);
+            }
+            else
+            {
+                xmlRpcResponse = new XmlRpcResponse();
+                Hashtable unknownMethodError = new Hashtable();
+                unknownMethodError["reason"] = "XmlRequest"; ;
+                unknownMethodError["message"] = "Unknown Rpc Request ["+methodName+"]";
+                unknownMethodError["login"] = "false";
+                xmlRpcResponse.Value = unknownMethodError;
+            }
+
+            response.AddHeader("Content-type", "text/xml");
+
+            string responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
+            
+            byte[] buffer = Encoding.UTF8.GetBytes(responseString);
+
+            response.SendChunked = false;
+            response.ContentLength64 = buffer.Length;
+            response.ContentEncoding = Encoding.UTF8;
+
+            response.OutputStream.Write(buffer, 0, buffer.Length);
+            response.OutputStream.Close();
+        }
+
+        public void Start()
+        {
+            MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
+
+            m_workerThread = new Thread(new ThreadStart(StartHTTP));
+            m_workerThread.IsBackground = true;
+            m_workerThread.Start();
+        }
+
+        private void StartHTTP()
+        {
+            try
+            {
+                MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
+                m_httpListener = new HttpListener();
+
+                m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
+                m_httpListener.Start();
+
+                HttpListenerContext context;
+                while (true)
+                {
+                    context = m_httpListener.GetContext();
+                    ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
+                }
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
+            }
+        }
+
+
+        public void RemoveStreamHandler(string httpMethod, string path)
+        {
+            m_streamHandlers.Remove(GetHandlerKey(httpMethod, path));
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs
index 0d9c674..0c714e6 100644
--- a/OpenSim/Framework/Servers/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs
@@ -1,40 +1,40 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using System.IO;

-

-namespace OpenSim.Framework.Servers

-{

-    public abstract class BaseStreamHandler : IStreamHandler

-    {

-        virtual public string ContentType

-        {

-            get { return "application/xml"; }

-        }

-

-        private string m_httpMethod;

-        virtual public string HttpMethod

-        {

-            get { return m_httpMethod; }

-        }

-

-        private string m_path;

-        virtual public string Path

-        {

-            get { return m_path; }

-        }

-        

-        protected string GetParam( string path )

-        {

-           return path.Substring( m_path.Length );

-        }

-        

-        public abstract byte[] Handle(string path, Stream request);

-

-        protected BaseStreamHandler(string httpMethod, string path)

-        {

-            m_httpMethod = httpMethod;

-            m_path = path;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace OpenSim.Framework.Servers
+{
+    public abstract class BaseStreamHandler : IStreamHandler
+    {
+        virtual public string ContentType
+        {
+            get { return "application/xml"; }
+        }
+
+        private string m_httpMethod;
+        virtual public string HttpMethod
+        {
+            get { return m_httpMethod; }
+        }
+
+        private string m_path;
+        virtual public string Path
+        {
+            get { return m_path; }
+        }
+        
+        protected string GetParam( string path )
+        {
+           return path.Substring( m_path.Length );
+        }
+        
+        public abstract byte[] Handle(string path, Stream request);
+
+        protected BaseStreamHandler(string httpMethod, string path)
+        {
+            m_httpMethod = httpMethod;
+            m_path = path;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
index 7d4e4ce..6e512f6 100644
--- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
@@ -1,49 +1,49 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using System.IO;

-

-namespace OpenSim.Framework.Servers

-{

-    public delegate string BinaryMethod(byte[] data, string path, string param);

-

-    public class BinaryStreamHandler : BaseStreamHandler

-    {

-        BinaryMethod m_method;

-

-        override public byte[] Handle(string path, Stream request)

-        {

-            byte[] data = ReadFully(request);

-            string param = GetParam(path);

-            string responseString = m_method(data, path, param);

-            

-            return Encoding.UTF8.GetBytes(responseString);

-        }

-

-        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)

-            : base(httpMethod, path)

-        {

-            m_method = binaryMethod;

-        }

-

-        private byte[] ReadFully(Stream stream)

-        {

-            byte[] buffer = new byte[32768];

-            using (MemoryStream ms = new MemoryStream())

-            {

-                while (true)

-                {

-                    int read = stream.Read(buffer, 0, buffer.Length);

-

-                    if (read <= 0)

-                    {

-                        return ms.ToArray();

-                    }

-                    

-                    ms.Write(buffer, 0, read);

-                }

-            }           

-        }

-    }

-

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace OpenSim.Framework.Servers
+{
+    public delegate string BinaryMethod(byte[] data, string path, string param);
+
+    public class BinaryStreamHandler : BaseStreamHandler
+    {
+        BinaryMethod m_method;
+
+        override public byte[] Handle(string path, Stream request)
+        {
+            byte[] data = ReadFully(request);
+            string param = GetParam(path);
+            string responseString = m_method(data, path, param);
+            
+            return Encoding.UTF8.GetBytes(responseString);
+        }
+
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
+            : base(httpMethod, path)
+        {
+            m_method = binaryMethod;
+        }
+
+        private byte[] ReadFully(Stream stream)
+        {
+            byte[] buffer = new byte[32768];
+            using (MemoryStream ms = new MemoryStream())
+            {
+                while (true)
+                {
+                    int read = stream.Read(buffer, 0, buffer.Length);
+
+                    if (read <= 0)
+                    {
+                        return ms.ToArray();
+                    }
+                    
+                    ms.Write(buffer, 0, read);
+                }
+            }           
+        }
+    }
+
+}
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs
index 89ec095..b1fa5cd 100644
--- a/OpenSim/Framework/Servers/CheckSumServer.cs
+++ b/OpenSim/Framework/Servers/CheckSumServer.cs
@@ -1,127 +1,127 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.

-* 

-*/

-namespace OpenSim.Framework.Servers

-{/*

-   public class CheckSumServer : UDPServerBase

-    {

-        //protected ConsoleBase m_log;

-

-        public CheckSumServer(int port)

-            : base(port)

-        {

-        }

-

-        protected override void OnReceivedData(IAsyncResult result)

-        {

-            ipeSender = new IPEndPoint(IPAddress.Any, 0);

-            epSender = (EndPoint)ipeSender;

-            Packet packet = null;

-            int numBytes = Server.EndReceiveFrom(result, ref epSender);

-            int packetEnd = numBytes - 1;

-

-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);

-

-            if (packet.Type == PacketType.SecuredTemplateChecksumRequest)

-            {

-                SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;

-                TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();

-                checkreply.DataBlock.Checksum = 3220703154;//180572585;

-                checkreply.DataBlock.Flags = 0;

-                checkreply.DataBlock.MajorVersion = 1;

-                checkreply.DataBlock.MinorVersion = 15;

-                checkreply.DataBlock.PatchVersion = 0;

-                checkreply.DataBlock.ServerVersion = 0;

-                checkreply.TokenBlock.Token = checksum.TokenBlock.Token;

-                this.SendPacket(checkreply, epSender);

-

-                /*

-                //if we wanted to echo the the checksum/ version from the client (so that any client worked)

-                SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();

-                checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;

-                this.SendPacket(checkrequest, epSender);

-                

-            }

-            else if (packet.Type == PacketType.TemplateChecksumReply)

-            {

-                //echo back the client checksum reply (Hegemon's method)

-                TemplateChecksumReplyPacket checksum2 = (TemplateChecksumReplyPacket)packet;

-                TemplateChecksumReplyPacket checkreply2 = new TemplateChecksumReplyPacket();

-                checkreply2.DataBlock.Checksum = checksum2.DataBlock.Checksum;

-                checkreply2.DataBlock.Flags = checksum2.DataBlock.Flags;

-                checkreply2.DataBlock.MajorVersion = checksum2.DataBlock.MajorVersion;

-                checkreply2.DataBlock.MinorVersion = checksum2.DataBlock.MinorVersion;

-                checkreply2.DataBlock.PatchVersion = checksum2.DataBlock.PatchVersion;

-                checkreply2.DataBlock.ServerVersion = checksum2.DataBlock.ServerVersion;

-                checkreply2.TokenBlock.Token = checksum2.TokenBlock.Token;

-                this.SendPacket(checkreply2, epSender);

-            }

-            else

-            {

-            }

-

-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

-        }

-

-        private void SendPacket(Packet Pack, EndPoint endp)

-        {

-            if (!Pack.Header.Resent)

-            {

-                Pack.Header.Sequence = 1;

-            }

-

-            byte[] ZeroOutBuffer = new byte[4096];

-            byte[] sendbuffer;

-            sendbuffer = Pack.ToBytes();

-

-            try

-            {

-                if (Pack.Header.Zerocoded)

-                {

-                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);

-                    this.SendPackTo(ZeroOutBuffer, packetsize, SocketFlags.None, endp);

-                }

-                else

-                {

-                    this.SendPackTo(sendbuffer, sendbuffer.Length, SocketFlags.None, endp);

-                }

-            }

-            catch (Exception)

-            {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");

-

-            }

-        }

-

-        private void SendPackTo(byte[] buffer, int size, SocketFlags flags, EndPoint endp)

-        {

-            this.Server.SendTo(buffer, size, flags, endp);

-        }

-  * }

- */

-    

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.
+* 
+*/
+namespace OpenSim.Framework.Servers
+{/*
+   public class CheckSumServer : UDPServerBase
+    {
+        //protected ConsoleBase m_log;
+
+        public CheckSumServer(int port)
+            : base(port)
+        {
+        }
+
+        protected override void OnReceivedData(IAsyncResult result)
+        {
+            ipeSender = new IPEndPoint(IPAddress.Any, 0);
+            epSender = (EndPoint)ipeSender;
+            Packet packet = null;
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int packetEnd = numBytes - 1;
+
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+            if (packet.Type == PacketType.SecuredTemplateChecksumRequest)
+            {
+                SecuredTemplateChecksumRequestPacket checksum = (SecuredTemplateChecksumRequestPacket)packet;
+                TemplateChecksumReplyPacket checkreply = new TemplateChecksumReplyPacket();
+                checkreply.DataBlock.Checksum = 3220703154;//180572585;
+                checkreply.DataBlock.Flags = 0;
+                checkreply.DataBlock.MajorVersion = 1;
+                checkreply.DataBlock.MinorVersion = 15;
+                checkreply.DataBlock.PatchVersion = 0;
+                checkreply.DataBlock.ServerVersion = 0;
+                checkreply.TokenBlock.Token = checksum.TokenBlock.Token;
+                this.SendPacket(checkreply, epSender);
+
+                /*
+                //if we wanted to echo the the checksum/ version from the client (so that any client worked)
+                SecuredTemplateChecksumRequestPacket checkrequest = new SecuredTemplateChecksumRequestPacket();
+                checkrequest.TokenBlock.Token = checksum.TokenBlock.Token;
+                this.SendPacket(checkrequest, epSender);
+                
+            }
+            else if (packet.Type == PacketType.TemplateChecksumReply)
+            {
+                //echo back the client checksum reply (Hegemon's method)
+                TemplateChecksumReplyPacket checksum2 = (TemplateChecksumReplyPacket)packet;
+                TemplateChecksumReplyPacket checkreply2 = new TemplateChecksumReplyPacket();
+                checkreply2.DataBlock.Checksum = checksum2.DataBlock.Checksum;
+                checkreply2.DataBlock.Flags = checksum2.DataBlock.Flags;
+                checkreply2.DataBlock.MajorVersion = checksum2.DataBlock.MajorVersion;
+                checkreply2.DataBlock.MinorVersion = checksum2.DataBlock.MinorVersion;
+                checkreply2.DataBlock.PatchVersion = checksum2.DataBlock.PatchVersion;
+                checkreply2.DataBlock.ServerVersion = checksum2.DataBlock.ServerVersion;
+                checkreply2.TokenBlock.Token = checksum2.TokenBlock.Token;
+                this.SendPacket(checkreply2, epSender);
+            }
+            else
+            {
+            }
+
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        private void SendPacket(Packet Pack, EndPoint endp)
+        {
+            if (!Pack.Header.Resent)
+            {
+                Pack.Header.Sequence = 1;
+            }
+
+            byte[] ZeroOutBuffer = new byte[4096];
+            byte[] sendbuffer;
+            sendbuffer = Pack.ToBytes();
+
+            try
+            {
+                if (Pack.Header.Zerocoded)
+                {
+                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
+                    this.SendPackTo(ZeroOutBuffer, packetsize, SocketFlags.None, endp);
+                }
+                else
+                {
+                    this.SendPackTo(sendbuffer, sendbuffer.Length, SocketFlags.None, endp);
+                }
+            }
+            catch (Exception)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
+
+            }
+        }
+
+        private void SendPackTo(byte[] buffer, int size, SocketFlags flags, EndPoint endp)
+        {
+            this.Server.SendTo(buffer, size, flags, endp);
+        }
+  * }
+ */
+    
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs
index 6cab40d..8858c99 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/IStreamHandler.cs
@@ -1,22 +1,22 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using System.IO;

-

-namespace OpenSim.Framework.Servers

-{

-    public interface IStreamHandler

-    {

-        // Handle request stream, return byte array

-        byte[] Handle(string path, Stream request );

-        

-        // Return response content type

-        string ContentType { get; }

-        

-        // Return required http method

-        string HttpMethod { get;}

-

-        // Return path

-        string Path { get; }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace OpenSim.Framework.Servers
+{
+    public interface IStreamHandler
+    {
+        // Handle request stream, return byte array
+        byte[] Handle(string path, Stream request );
+        
+        // Return response content type
+        string ContentType { get; }
+        
+        // Return required http method
+        string HttpMethod { get;}
+
+        // Return path
+        string Path { get; }
+    }
+}
diff --git a/OpenSim/Framework/Servers/RestMethod.cs b/OpenSim/Framework/Servers/RestMethod.cs
index c6cb230..0c2624b 100644
--- a/OpenSim/Framework/Servers/RestMethod.cs
+++ b/OpenSim/Framework/Servers/RestMethod.cs
@@ -1,31 +1,31 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.

-* 

-*/

-namespace OpenSim.Framework.Servers

-{

-    public delegate string RestMethod( string request, string path, string param );

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.
+* 
+*/
+namespace OpenSim.Framework.Servers
+{
+    public delegate string RestMethod( string request, string path, string param );
+}
diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs
index 1b3b41c..6753a06 100644
--- a/OpenSim/Framework/Servers/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/RestStreamHandler.cs
@@ -1,31 +1,31 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using System.IO;

-

-namespace OpenSim.Framework.Servers

-{

-    public class RestStreamHandler : BaseStreamHandler

-    {

-        RestMethod m_restMethod;

-

-        override public byte[] Handle(string path, Stream request )

-        {

-            Encoding encoding = Encoding.UTF8;

-            StreamReader streamReader = new StreamReader(request, encoding);

-

-            string requestBody = streamReader.ReadToEnd();

-            streamReader.Close();

-

-            string param = GetParam(path);

-            string responseString = m_restMethod(requestBody, path, param );

-

-            return Encoding.UTF8.GetBytes(responseString);

-        }

-

-        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod) : base( httpMethod, path )

-        {

-            m_restMethod = restMethod;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace OpenSim.Framework.Servers
+{
+    public class RestStreamHandler : BaseStreamHandler
+    {
+        RestMethod m_restMethod;
+
+        override public byte[] Handle(string path, Stream request )
+        {
+            Encoding encoding = Encoding.UTF8;
+            StreamReader streamReader = new StreamReader(request, encoding);
+
+            string requestBody = streamReader.ReadToEnd();
+            streamReader.Close();
+
+            string param = GetParam(path);
+            string responseString = m_restMethod(requestBody, path, param );
+
+            return Encoding.UTF8.GetBytes(responseString);
+        }
+
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod) : base( httpMethod, path )
+        {
+            m_restMethod = restMethod;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Servers/UDPServerBase.cs b/OpenSim/Framework/Servers/UDPServerBase.cs
index 508eb9d..8113207 100644
--- a/OpenSim/Framework/Servers/UDPServerBase.cs
+++ b/OpenSim/Framework/Servers/UDPServerBase.cs
@@ -1,87 +1,87 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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.Net.Sockets;

-using libsecondlife.Packets;

-

-namespace OpenSim.Framework.Servers

-{

-    public class UDPServerBase

-    {

-        public Socket Server;

-        protected IPEndPoint ServerIncoming;

-        protected byte[] RecvBuffer = new byte[4096];

-        protected byte[] ZeroBuffer = new byte[8192];

-        protected IPEndPoint ipeSender;

-        protected EndPoint epSender;

-        protected AsyncCallback ReceivedData;

-        protected int listenPort;

-

-        public UDPServerBase(int port)

-        {

-            listenPort = port;

-        }

-

-        protected virtual void OnReceivedData(IAsyncResult result)

-        {

-            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);

-            epSender = (EndPoint)ipeSender;

-            Packet packet = null;

-            int numBytes = Server.EndReceiveFrom(result, ref epSender);

-            int packetEnd = numBytes - 1;

-

-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);

-

-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

-        }

-

-        protected virtual void AddNewClient(Packet packet)

-        {

-        }

-

-        public virtual void ServerListener()

-        {

-

-            ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);

-            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);

-            Server.Bind(ServerIncoming);

-

-            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);

-            epSender = (EndPoint)ipeSender;

-            ReceivedData = new AsyncCallback(this.OnReceivedData);

-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

-        }

-

-        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)

-        {

-

-        }

-    }

-}

-

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Net.Sockets;
+using libsecondlife.Packets;
+
+namespace OpenSim.Framework.Servers
+{
+    public class UDPServerBase
+    {
+        public Socket Server;
+        protected IPEndPoint ServerIncoming;
+        protected byte[] RecvBuffer = new byte[4096];
+        protected byte[] ZeroBuffer = new byte[8192];
+        protected IPEndPoint ipeSender;
+        protected EndPoint epSender;
+        protected AsyncCallback ReceivedData;
+        protected int listenPort;
+
+        public UDPServerBase(int port)
+        {
+            listenPort = port;
+        }
+
+        protected virtual void OnReceivedData(IAsyncResult result)
+        {
+            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            epSender = (EndPoint)ipeSender;
+            Packet packet = null;
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int packetEnd = numBytes - 1;
+
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        protected virtual void AddNewClient(Packet packet)
+        {
+        }
+
+        public virtual void ServerListener()
+        {
+
+            ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
+            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            Server.Bind(ServerIncoming);
+
+            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            epSender = (EndPoint)ipeSender;
+            ReceivedData = new AsyncCallback(this.OnReceivedData);
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
+        {
+
+        }
+    }
+}
+
diff --git a/OpenSim/Framework/Servers/XmlRpcMethod.cs b/OpenSim/Framework/Servers/XmlRpcMethod.cs
index b76ac51..b8abecf 100644
--- a/OpenSim/Framework/Servers/XmlRpcMethod.cs
+++ b/OpenSim/Framework/Servers/XmlRpcMethod.cs
@@ -1,33 +1,33 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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 Nwc.XmlRpc;

-

-namespace OpenSim.Framework.Servers

-{

-    public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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 Nwc.XmlRpc;
+
+namespace OpenSim.Framework.Servers
+{
+    public delegate XmlRpcResponse XmlRpcMethod( XmlRpcRequest request );    
+}