changed to native line ending encoding

4 files changed, 436 insertions, 436 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index c47904d..3ce0cc5 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -1,55 +1,55 @@
-/*

-* 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 OpenSim.Framework.Communications;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Servers;

-

-namespace OpenSim.Region.Communications.Local

-{

-    public class CommunicationsLocal : CommunicationsManager

-    {

-        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();

-        public LocalUserServices UserServices;

-

-        public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer )

-            : base(serversInfo, httpServer)

-        {

-            UserServices = new LocalUserServices(this, serversInfo);

-            UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");

-            UserServer = UserServices;

-            GridServer = SandBoxServices;

-            InterRegion = SandBoxServices;

-            httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod);

-        }

-

-        internal void InformRegionOfLogin(ulong regionHandle, Login login)

-        {

-            this.SandBoxServices.AddNewSession(regionHandle, login);

-        }

-    }

-}

+/*
+* 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 OpenSim.Framework.Communications;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Servers;
+
+namespace OpenSim.Region.Communications.Local
+{
+    public class CommunicationsLocal : CommunicationsManager
+    {
+        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
+        public LocalUserServices UserServices;
+
+        public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer )
+            : base(serversInfo, httpServer)
+        {
+            UserServices = new LocalUserServices(this, serversInfo);
+            UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
+            UserServer = UserServices;
+            GridServer = SandBoxServices;
+            InterRegion = SandBoxServices;
+            httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod);
+        }
+
+        internal void InformRegionOfLogin(ulong regionHandle, Login login)
+        {
+            this.SandBoxServices.AddNewSession(regionHandle, login);
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index d0cd991..9322f3b 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -1,206 +1,206 @@
-/*

-* 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.Collections.Generic;

-using libsecondlife;

-using OpenSim.Framework;

-using OpenSim.Framework.Communications;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Region.Communications.Local

-{

-

-    public class LocalBackEndServices : IGridServices, IInterRegionCommunications

-    {

-        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();

-        protected Dictionary<ulong, RegionCommsListener> regionHosts = new Dictionary<ulong, RegionCommsListener>();

-

-        public LocalBackEndServices()

-        {

-

-        }

-

-        /// <summary>

-        /// Register a region method with the BackEnd Services.

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        /// <returns></returns>

-        public RegionCommsListener RegisterRegion(RegionInfo regionInfo)

-        {

-            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");

-            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))

-            {

-                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );

-                this.regions.Add(regionInfo.RegionHandle, regionInfo);

-                RegionCommsListener regionHost = new RegionCommsListener();

-                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);

-

-                return regionHost;

-            }

-

-            //already in our list of regions so for now lets return null

-            return null;

-        }

-

-        /// <summary>

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        /// <returns></returns>

-        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)

-        {

-            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);

-            List<RegionInfo> neighbours = new List<RegionInfo>();

-

-            foreach (RegionInfo reg in this.regions.Values)

-            {

-                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);

-                if (reg.RegionHandle != regionInfo.RegionHandle)

-                {

-                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");

-                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))

-                    {

-                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))

-                        {

-                            neighbours.Add(reg);

-                        }

-                    }

-                }

-            }

-            return neighbours;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <returns></returns>

-        public RegionInfo RequestNeighbourInfo(ulong regionHandle)

-        {

-            if (this.regions.ContainsKey(regionHandle))

-            {

-                return this.regions[regionHandle];

-            }

-            return null;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="minX"></param>

-        /// <param name="minY"></param>

-        /// <param name="maxX"></param>

-        /// <param name="maxY"></param>

-        /// <returns></returns>

-        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)

-        {

-            List<MapBlockData> mapBlocks = new List<MapBlockData>();

-            foreach(RegionInfo regInfo in this.regions.Values)

-            {

-                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))

-                {

-                    MapBlockData map = new MapBlockData();

-                    map.Name = regInfo.RegionName;

-                    map.X = (ushort)regInfo.RegionLocX;

-                    map.Y = (ushort)regInfo.RegionLocY;

-                    map.WaterHeight =(byte) regInfo.estateSettings.waterHeight;

-                    map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");

-                    map.Agents = 1;

-                    map.RegionFlags = 72458694;

-                    map.Access = 13;

-                    mapBlocks.Add(map);

-                }

-            }

-            return mapBlocks;

-        }

-

-        /// <summary>

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="agentData"></param>

-        /// <returns></returns>

-        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData

-        {

-            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");

-            if (this.regionHosts.ContainsKey(regionHandle))

-            {

-                // Console.WriteLine("CommsManager- Informing a region to expect child agent");

-                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);

-                return true;

-            }

-            return false;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="agentID"></param>

-        /// <param name="position"></param>

-        /// <returns></returns>

-        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

-        {

-            if (this.regionHosts.ContainsKey(regionHandle))

-            {

-                // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");

-                this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);

-                return true;

-            }

-            return false;

-        }

-

-        /// <summary>

-        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="loginData"></param>

-        /// <returns></returns>

-        public bool AddNewSession(ulong regionHandle, Login loginData)

-        {

-            AgentCircuitData agent = new AgentCircuitData();

-            agent.AgentID = loginData.Agent;

-            agent.firstname = loginData.First;

-            agent.lastname = loginData.Last;

-            agent.SessionID = loginData.Session;

-            agent.SecureSessionID = loginData.SecureSession;

-            agent.circuitcode = loginData.CircuitCode;

-            agent.BaseFolder = loginData.BaseFolder;

-            agent.InventoryFolder = loginData.InventoryFolder;

-            agent.startpos = new LLVector3(128, 128, 70);

-            agent.CapsPath = loginData.CapsPath;

-

-            if (this.regionHosts.ContainsKey(regionHandle))

-            {

-                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);

-                return true;

-            }

-

-            // region not found

-            return false;

-        }

-    }

-}

-

+/*
+* 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.Collections.Generic;
+using libsecondlife;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Communications.Local
+{
+
+    public class LocalBackEndServices : IGridServices, IInterRegionCommunications
+    {
+        protected Dictionary<ulong, RegionInfo> regions = new Dictionary<ulong, RegionInfo>();
+        protected Dictionary<ulong, RegionCommsListener> regionHosts = new Dictionary<ulong, RegionCommsListener>();
+
+        public LocalBackEndServices()
+        {
+
+        }
+
+        /// <summary>
+        /// Register a region method with the BackEnd Services.
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
+        {
+            //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
+            if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle))
+            {
+                //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle );
+                this.regions.Add(regionInfo.RegionHandle, regionInfo);
+                RegionCommsListener regionHost = new RegionCommsListener();
+                this.regionHosts.Add(regionInfo.RegionHandle, regionHost);
+
+                return regionHost;
+            }
+
+            //already in our list of regions so for now lets return null
+            return null;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <returns></returns>
+        public List<RegionInfo> RequestNeighbours(RegionInfo regionInfo)
+        {
+            // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle);
+            List<RegionInfo> neighbours = new List<RegionInfo>();
+
+            foreach (RegionInfo reg in this.regions.Values)
+            {
+                // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
+                if (reg.RegionHandle != regionInfo.RegionHandle)
+                {
+                    //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
+                    if ((reg.RegionLocX > (regionInfo.RegionLocX - 2)) && (reg.RegionLocX < (regionInfo.RegionLocX + 2)))
+                    {
+                        if ((reg.RegionLocY > (regionInfo.RegionLocY - 2)) && (reg.RegionLocY < (regionInfo.RegionLocY + 2)))
+                        {
+                            neighbours.Add(reg);
+                        }
+                    }
+                }
+            }
+            return neighbours;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <returns></returns>
+        public RegionInfo RequestNeighbourInfo(ulong regionHandle)
+        {
+            if (this.regions.ContainsKey(regionHandle))
+            {
+                return this.regions[regionHandle];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="minX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxX"></param>
+        /// <param name="maxY"></param>
+        /// <returns></returns>
+        public List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            List<MapBlockData> mapBlocks = new List<MapBlockData>();
+            foreach(RegionInfo regInfo in this.regions.Values)
+            {
+                if (((regInfo.RegionLocX >= minX) && (regInfo.RegionLocX <= maxX)) && ((regInfo.RegionLocY >= minY) && (regInfo.RegionLocY <= maxY)))
+                {
+                    MapBlockData map = new MapBlockData();
+                    map.Name = regInfo.RegionName;
+                    map.X = (ushort)regInfo.RegionLocX;
+                    map.Y = (ushort)regInfo.RegionLocY;
+                    map.WaterHeight =(byte) regInfo.estateSettings.waterHeight;
+                    map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
+                    map.Agents = 1;
+                    map.RegionFlags = 72458694;
+                    map.Access = 13;
+                    mapBlocks.Add(map);
+                }
+            }
+            return mapBlocks;
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agentData"></param>
+        /// <returns></returns>
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) //should change from agentCircuitData
+        {
+            //Console.WriteLine("CommsManager- Trying to Inform a region to expect child agent");
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                // Console.WriteLine("CommsManager- Informing a region to expect child agent");
+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agentData);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agentID"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)
+        {
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                // Console.WriteLine("CommsManager- Informing a region to expect avatar crossing");
+                this.regionHosts[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Is a Sandbox mode method, used by the local Login server to inform a region of a connection user/session
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="loginData"></param>
+        /// <returns></returns>
+        public bool AddNewSession(ulong regionHandle, Login loginData)
+        {
+            AgentCircuitData agent = new AgentCircuitData();
+            agent.AgentID = loginData.Agent;
+            agent.firstname = loginData.First;
+            agent.lastname = loginData.Last;
+            agent.SessionID = loginData.Session;
+            agent.SecureSessionID = loginData.SecureSession;
+            agent.circuitcode = loginData.CircuitCode;
+            agent.BaseFolder = loginData.BaseFolder;
+            agent.InventoryFolder = loginData.InventoryFolder;
+            agent.startpos = new LLVector3(128, 128, 70);
+            agent.CapsPath = loginData.CapsPath;
+
+            if (this.regionHosts.ContainsKey(regionHandle))
+            {
+                this.regionHosts[regionHandle].TriggerExpectUser(regionHandle, agent);
+                return true;
+            }
+
+            // region not found
+            return false;
+        }
+    }
+}
+
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 592b36c..a4cefc4 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -1,142 +1,142 @@
-using System;

-using libsecondlife;

-using OpenSim.Framework.Communications;

-using OpenSim.Framework.Data;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.UserManagement;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Region.Communications.Local

-{

-    public class LocalUserServices : UserManagerBase, IUserServices

-    {

-        private CommunicationsLocal m_Parent;

-

-        private NetworkServersInfo serversInfo;

-        private uint defaultHomeX ;

-        private uint defaultHomeY;

-        public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData)

-        {

-            m_Parent = parent;

-            this.serversInfo = serversData;

-            defaultHomeX = this.serversInfo.DefaultHomeLocX;

-            defaultHomeY = this.serversInfo.DefaultHomeLocY;

-        }

-

-        public UserProfileData GetUserProfile(string firstName, string lastName)

-        {

-            return GetUserProfile(firstName + " " + lastName);

-        }

-

-        public UserProfileData GetUserProfile(string name)

-        {

-            return this.getUserProfile(name);

-        }

-

-        public UserProfileData GetUserProfile(LLUUID avatarID)

-        {

-            return this.getUserProfile(avatarID);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public override string GetMessage()

-        {

-            return "Welcome to OpenSim";

-        }

-

-        public override UserProfileData GetTheUser(string firstname, string lastname)

-        {

-            UserProfileData profile = getUserProfile(firstname, lastname);

-            if (profile != null)

-            {

-               

-                return profile;

-            }

-

-            //no current user account so make one

-            Console.WriteLine("No User account found so creating a new one ");

-            this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);

-            

-            profile = getUserProfile(firstname, lastname);

-

-            return profile;

-        }

-

-        public override bool AuthenticateUser(UserProfileData profile, string password)

-        {

-            //for now we will accept any password in sandbox mode

-            Console.WriteLine("authorising user");

-            return true;

-        }

-

-        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)

-        {

-            ulong currentRegion = theUser.currentAgent.currentHandle;

-            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);

-

-            if (reg != null)

-            {

-                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +

-                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +

-                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";

-                string capsPath = Util.GetRandomCapsPath();

-                response.SimAddress = reg.ExternalEndPoint.Address.ToString();

-                response.SimPort = (Int32)reg.ExternalEndPoint.Port;

-                response.RegionX = reg.RegionLocX ;

-                response.RegionY = reg.RegionLocY ;

-

-                //following port needs changing as we don't want a http listener for every region (or do we?)

-                response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";

-                theUser.currentAgent.currentRegion = reg.SimUUID;

-                theUser.currentAgent.currentHandle = reg.RegionHandle;

-

-                Login _login = new Login();

-                //copy data to login object

-                _login.First = response.Firstname;

-                _login.Last = response.Lastname;

-                _login.Agent = response.AgentID;

-                _login.Session = response.SessionID;

-                _login.SecureSession = response.SecureSessionID;

-                _login.CircuitCode = (uint)response.CircuitCode;

-                _login.CapsPath = capsPath;

-

-                m_Parent.InformRegionOfLogin(currentRegion, _login);

-            }

-            else

-            {

-                Console.WriteLine("not found region " + currentRegion);

-            }

-

-        }

-

-        public UserProfileData SetupMasterUser(string firstName, string lastName)

-        {

-            return SetupMasterUser(firstName, lastName, "");

-        }

-

-        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)

-        {

-            UserProfileData profile = getUserProfile(firstName, lastName);

-            if (profile != null)

-            {

-

-                return profile;

-            }

-

-            Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");

-            this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);

-

-            profile = getUserProfile(firstName, lastName);

-

-            if (profile == null)

-            {

-                Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");

-            }

-

-            return profile;

-        }

-    }

-}

+using System;
+using libsecondlife;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.UserManagement;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region.Communications.Local
+{
+    public class LocalUserServices : UserManagerBase, IUserServices
+    {
+        private CommunicationsLocal m_Parent;
+
+        private NetworkServersInfo serversInfo;
+        private uint defaultHomeX ;
+        private uint defaultHomeY;
+        public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData)
+        {
+            m_Parent = parent;
+            this.serversInfo = serversData;
+            defaultHomeX = this.serversInfo.DefaultHomeLocX;
+            defaultHomeY = this.serversInfo.DefaultHomeLocY;
+        }
+
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return GetUserProfile(firstName + " " + lastName);
+        }
+
+        public UserProfileData GetUserProfile(string name)
+        {
+            return this.getUserProfile(name);
+        }
+
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return this.getUserProfile(avatarID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override string GetMessage()
+        {
+            return "Welcome to OpenSim";
+        }
+
+        public override UserProfileData GetTheUser(string firstname, string lastname)
+        {
+            UserProfileData profile = getUserProfile(firstname, lastname);
+            if (profile != null)
+            {
+               
+                return profile;
+            }
+
+            //no current user account so make one
+            Console.WriteLine("No User account found so creating a new one ");
+            this.AddUserProfile(firstname, lastname, "test", defaultHomeX, defaultHomeY);
+            
+            profile = getUserProfile(firstname, lastname);
+
+            return profile;
+        }
+
+        public override bool AuthenticateUser(UserProfileData profile, string password)
+        {
+            //for now we will accept any password in sandbox mode
+            Console.WriteLine("authorising user");
+            return true;
+        }
+
+        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
+        {
+            ulong currentRegion = theUser.currentAgent.currentHandle;
+            RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
+
+            if (reg != null)
+            {
+                response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " +
+                 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
+                 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
+                string capsPath = Util.GetRandomCapsPath();
+                response.SimAddress = reg.ExternalEndPoint.Address.ToString();
+                response.SimPort = (Int32)reg.ExternalEndPoint.Port;
+                response.RegionX = reg.RegionLocX ;
+                response.RegionY = reg.RegionLocY ;
+
+                //following port needs changing as we don't want a http listener for every region (or do we?)
+                response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
+                theUser.currentAgent.currentRegion = reg.SimUUID;
+                theUser.currentAgent.currentHandle = reg.RegionHandle;
+
+                Login _login = new Login();
+                //copy data to login object
+                _login.First = response.Firstname;
+                _login.Last = response.Lastname;
+                _login.Agent = response.AgentID;
+                _login.Session = response.SessionID;
+                _login.SecureSession = response.SecureSessionID;
+                _login.CircuitCode = (uint)response.CircuitCode;
+                _login.CapsPath = capsPath;
+
+                m_Parent.InformRegionOfLogin(currentRegion, _login);
+            }
+            else
+            {
+                Console.WriteLine("not found region " + currentRegion);
+            }
+
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            return SetupMasterUser(firstName, lastName, "");
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            UserProfileData profile = getUserProfile(firstName, lastName);
+            if (profile != null)
+            {
+
+                return profile;
+            }
+
+            Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
+            this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);
+
+            profile = getUserProfile(firstName, lastName);
+
+            if (profile == null)
+            {
+                Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
+            }
+
+            return profile;
+        }
+    }
+}
diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 9afb75e..ca64319 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -1,33 +1,33 @@
-using System.Reflection;

-using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")]

-[assembly: AssemblyCopyright("Copyright ©  2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+using System.Reflection;
+using System.Runtime.InteropServices;
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Region.Communications.Local")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Region.Communications.Local")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fb173926-bd0a-4cd0-bb45-185b2f72ddfb")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]