12 files changed, 1376 insertions, 1341 deletions

diff --git a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
index 063774c..f77ef4b 100644
--- a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
@@ -1,213 +1,213 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Timers;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Grid.Framework;
-using Timer = System.Timers.Timer;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    public class MessageRegionModule : IMessageRegionService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MessageServerConfig m_cfg;
-
-        private IMessageUserServerService m_userServerModule;
-
-        private IUGAIMCore m_messageCore;
-
-        // a dictionary of all current regions this server knows about
-        private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();
-
-        public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore)
-        {
-            m_cfg = config;
-            m_messageCore = messageCore;
-        }
-
-        public void Initialise()
-        {
-            m_messageCore.RegisterInterface<IMessageRegionService>(this);
-        }
-
-        public void PostInitialise()
-        {
-            IMessageUserServerService messageUserServer;
-            if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
-            {
-                m_userServerModule = messageUserServer;
-            }
-        }
-
-        public void RegisterHandlers()
-        {
-            //have these in separate method as some servers restart the http server and reregister all the handlers.
-           
-        }
-
-         /// <summary>
-        /// Gets and caches a RegionInfo object from the gridserver based on regionhandle
-        /// if the regionhandle is already cached, use the cached values
-        /// Gets called by lots of threads!!!!!
-        /// </summary>
-        /// <param name="regionhandle">handle to the XY of the region we're looking for</param>
-        /// <returns>A RegionInfo object to stick in the presence info</returns>
-        public RegionProfileData GetRegionInfo(ulong regionhandle)
-        {
-            RegionProfileData regionInfo = null;
-
-            lock (m_regionInfoCache)
-            {
-                m_regionInfoCache.TryGetValue(regionhandle, out regionInfo);
-            }
-
-            if (regionInfo == null) // not found in cache
-            {
-                regionInfo = RequestRegionInfo(regionhandle);
-
-                if (regionInfo != null) // lookup was successful
-                {
-                    lock (m_regionInfoCache)
-                    {
-                        m_regionInfoCache[regionhandle] = regionInfo;
-                    }
-                }
-            }
-
-            return regionInfo;
-        }
-
-        public int ClearRegionCache()
-        {
-            int cachecount = 0;
-
-            lock (m_regionInfoCache)
-            {
-                cachecount = m_regionInfoCache.Count;
-                m_regionInfoCache.Clear();
-            }
-
-            return cachecount;
-        }
-
-        /// <summary>
-        /// Get RegionProfileData from the GridServer.
-        /// We'll cache this information in GetRegionInfo and use it for presence updates
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <returns></returns>
-        public RegionProfileData RequestRegionInfo(ulong regionHandle)
-        {
-            RegionProfileData regionProfile = null;
-            try
-            {
-                Hashtable requestData = new Hashtable();
-                requestData["region_handle"] = regionHandle.ToString();
-                requestData["authkey"] = m_cfg.GridSendKey;
-
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(requestData);
-
-                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-
-                XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
-
-                Hashtable responseData = (Hashtable)GridResp.Value;
-
-                if (responseData.ContainsKey("error"))
-                {
-                    m_log.Error("[GRID]: error received from grid server" + responseData["error"]);
-                    return null;
-                }
-
-                uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
-                uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
-                string internalIpStr = (string)responseData["sim_ip"];
-
-                regionProfile = new RegionProfileData();
-                regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);
-                regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";
-                regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
-                regionProfile.regionLocX = regX;
-                regionProfile.regionLocY = regY;
-
-                regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
-                regionProfile.UUID = new UUID((string)responseData["region_UUID"]);
-                regionProfile.regionName = (string)responseData["region_name"];
-            }
-            catch (WebException)
-            {
-                m_log.Error("[GRID]: " +
-                            "Region lookup failed for: " + regionHandle.ToString() +
-                            " - Is the GridServer down?");
-            }
-
-            return regionProfile;
-        }
-
-        public XmlRpcResponse RegionStartup(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable result = new Hashtable();
-            result["success"] = "FALSE";
-
-            if (m_userServerModule.SendToUserServer(requestData, "region_startup"))
-                result["success"] = "TRUE";
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = result;
-            return response;
-        }
-
-        public XmlRpcResponse RegionShutdown(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable result = new Hashtable();
-            result["success"] = "FALSE";
-
-            if (m_userServerModule.SendToUserServer(requestData, "region_shutdown"))
-                result["success"] = "TRUE";
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = result;
-            return response;
-        }
-
-    }
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Reflection;

+using System.Threading;

+using System.Timers;

+using log4net;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Data;

+using OpenSim.Framework;

+using OpenSim.Grid.Framework;

+using Timer = System.Timers.Timer;

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public class MessageRegionModule : IMessageRegionService

+    {

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+

+        private MessageServerConfig m_cfg;

+

+        private IMessageUserServerService m_userServerModule;

+

+        private IUGAIMCore m_messageCore;

+

+        // a dictionary of all current regions this server knows about

+        private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>();

+

+        public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore)

+        {

+            m_cfg = config;

+            m_messageCore = messageCore;

+        }

+

+        public void Initialise()

+        {

+            m_messageCore.RegisterInterface<IMessageRegionService>(this);

+        }

+

+        public void PostInitialise()

+        {

+            IMessageUserServerService messageUserServer;

+            if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))

+            {

+                m_userServerModule = messageUserServer;

+            }

+        }

+

+        public void RegisterHandlers()

+        {

+            //have these in separate method as some servers restart the http server and reregister all the handlers.

+           

+        }

+

+         /// <summary>

+        /// Gets and caches a RegionInfo object from the gridserver based on regionhandle

+        /// if the regionhandle is already cached, use the cached values

+        /// Gets called by lots of threads!!!!!

+        /// </summary>

+        /// <param name="regionhandle">handle to the XY of the region we're looking for</param>

+        /// <returns>A RegionInfo object to stick in the presence info</returns>

+        public RegionProfileData GetRegionInfo(ulong regionhandle)

+        {

+            RegionProfileData regionInfo = null;

+

+            lock (m_regionInfoCache)

+            {

+                m_regionInfoCache.TryGetValue(regionhandle, out regionInfo);

+            }

+

+            if (regionInfo == null) // not found in cache

+            {

+                regionInfo = RequestRegionInfo(regionhandle);

+

+                if (regionInfo != null) // lookup was successful

+                {

+                    lock (m_regionInfoCache)

+                    {

+                        m_regionInfoCache[regionhandle] = regionInfo;

+                    }

+                }

+            }

+

+            return regionInfo;

+        }

+

+        public int ClearRegionCache()

+        {

+            int cachecount = 0;

+

+            lock (m_regionInfoCache)

+            {

+                cachecount = m_regionInfoCache.Count;

+                m_regionInfoCache.Clear();

+            }

+

+            return cachecount;

+        }

+

+        /// <summary>

+        /// Get RegionProfileData from the GridServer.

+        /// We'll cache this information in GetRegionInfo and use it for presence updates

+        /// </summary>

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

+        /// <returns></returns>

+        public RegionProfileData RequestRegionInfo(ulong regionHandle)

+        {

+            RegionProfileData regionProfile = null;

+            try

+            {

+                Hashtable requestData = new Hashtable();

+                requestData["region_handle"] = regionHandle.ToString();

+                requestData["authkey"] = m_cfg.GridSendKey;

+

+                ArrayList SendParams = new ArrayList();

+                SendParams.Add(requestData);

+

+                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);

+

+                XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);

+

+                Hashtable responseData = (Hashtable)GridResp.Value;

+

+                if (responseData.ContainsKey("error"))

+                {

+                    m_log.Error("[GRID]: error received from grid server" + responseData["error"]);

+                    return null;

+                }

+

+                uint regX = Convert.ToUInt32((string)responseData["region_locx"]);

+                uint regY = Convert.ToUInt32((string)responseData["region_locy"]);

+                string internalIpStr = (string)responseData["sim_ip"];

+

+                regionProfile = new RegionProfileData();

+                regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]);

+                regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/";

+                regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));

+                regionProfile.regionLocX = regX;

+                regionProfile.regionLocY = regY;

+

+                regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);

+                regionProfile.UUID = new UUID((string)responseData["region_UUID"]);

+                regionProfile.regionName = (string)responseData["region_name"];

+            }

+            catch (WebException)

+            {

+                m_log.Error("[GRID]: " +

+                            "Region lookup failed for: " + regionHandle.ToString() +

+                            " - Is the GridServer down?");

+            }

+

+            return regionProfile;

+        }

+

+        public XmlRpcResponse RegionStartup(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+            Hashtable result = new Hashtable();

+            result["success"] = "FALSE";

+

+            if (m_userServerModule.SendToUserServer(requestData, "region_startup"))

+                result["success"] = "TRUE";

+

+            XmlRpcResponse response = new XmlRpcResponse();

+            response.Value = result;

+            return response;

+        }

+

+        public XmlRpcResponse RegionShutdown(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+            Hashtable result = new Hashtable();

+            result["success"] = "FALSE";

+

+            if (m_userServerModule.SendToUserServer(requestData, "region_shutdown"))

+                result["success"] = "TRUE";

+

+            XmlRpcResponse response = new XmlRpcResponse();

+            response.Value = result;

+            return response;

+        }

+

+    }

+}

diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
index a301732..15cfa3b 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs
@@ -1,488 +1,488 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Timers;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Grid.Framework;
-using Timer=System.Timers.Timer;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    public class MessageService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MessageServerConfig m_cfg;
-        private UserDataBaseService m_userDataBaseService;
-
-        private IUGAIMCore m_messageCore;
-
-        private IMessageUserServerService m_userServerModule;
-        private IMessageRegionService m_regionModule;
-
-        // a dictionary of all current presences this server knows about
-        private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>();
-
-        public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService)
-        {
-            m_cfg = cfg;
-            m_messageCore = messageCore;
-
-            m_userDataBaseService = userDataBaseService;
-
-            //??? 
-            UserConfig uc = new UserConfig();
-            uc.DatabaseConnect = cfg.DatabaseConnect;
-            uc.DatabaseProvider = cfg.DatabaseProvider;
-        }
-
-        public void Initialise()
-        {
-        }
-  
-        public void PostInitialise()
-        {
-            IMessageUserServerService messageUserServer;
-            if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))
-            {
-                m_userServerModule = messageUserServer;
-            }
-
-            IMessageRegionService messageRegion;
-            if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion))
-            {
-                m_regionModule = messageRegion;
-            }
-        }
-
-        public void RegisterHandlers()
-        {
-            //have these in separate method as some servers restart the http server and reregister all the handlers.
-
-        }
-
-        #region FriendList Methods
-
-        /// <summary>
-        /// Process Friendlist subscriptions for a user
-        /// The login method calls this for a User
-        /// </summary>
-        /// <param name="userpresence">The Agent we're processing the friendlist subscriptions for</param>
-        private void ProcessFriendListSubscriptions(UserPresenceData userpresence)
-        {
-            lock (m_presences)
-            {
-                m_presences[userpresence.agentData.AgentID] = userpresence;
-            }
-
-            Dictionary<UUID, FriendListItem> uFriendList = userpresence.friendData;
-            foreach (KeyValuePair<UUID, FriendListItem> pair in uFriendList)
-            {
-                UserPresenceData friendup = null;
-                lock (m_presences)
-                {
-                    m_presences.TryGetValue(pair.Key, out friendup);
-                }
-                if (friendup != null)
-                {
-                    SubscribeToPresenceUpdates(userpresence, friendup, pair.Value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Enqueues a presence update, sending info about user 'talkingAbout' to user 'receiver'.
-        /// </summary>
-        /// <param name="talkingAbout">We are sending presence information about this user.</param>
-        /// <param name="receiver">We are sending the presence update to this user</param>
-        private void enqueuePresenceUpdate(UserPresenceData talkingAbout, UserPresenceData receiver)
-        {
-            UserAgentData p2Handle = m_userDataBaseService.GetUserAgentData(receiver.agentData.AgentID);
-            if (p2Handle != null)
-            {
-                if (receiver.lookupUserRegionYN)
-                {
-                    receiver.regionData.regionHandle = p2Handle.Handle;
-                }
-                else
-                {
-                    receiver.lookupUserRegionYN = true; // TODO Huh?
-                }
-
-                PresenceInformer friendlistupdater = new PresenceInformer();
-                friendlistupdater.presence1 = talkingAbout;
-                friendlistupdater.presence2 = receiver;
-                friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo;
-                friendlistupdater.OnDone += PresenceUpdateDone;
-                WaitCallback cb = new WaitCallback(friendlistupdater.go);
-                ThreadPool.QueueUserWorkItem(cb);
-            }
-            else
-            {
-                m_log.WarnFormat("no data found for user {0}", receiver.agentData.AgentID);
-                // Skip because we can't find any data on the user
-            }
-        }
-
-        /// <summary>
-        /// Does the necessary work to subscribe one agent to another's presence notifications
-        /// Gets called by ProcessFriendListSubscriptions.  You shouldn't call this directly
-        /// unless you know what you're doing
-        /// </summary>
-        /// <param name="userpresence">P1</param>
-        /// <param name="friendpresence">P2</param>
-        /// <param name="uFriendListItem"></param>
-        private void SubscribeToPresenceUpdates(UserPresenceData userpresence,
-                                               UserPresenceData friendpresence,
-                                               FriendListItem uFriendListItem)
-        {
-            // Can the friend see me online?
-            if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
-            {
-                // tell user to update friend about user's presence changes
-                if (!userpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))
-                {
-                   userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);
-                }
-
-                // send an update about user's presence to the friend
-                enqueuePresenceUpdate(userpresence, friendpresence);
-            }
-
-            // Can I see the friend online?
-            if ((uFriendListItem.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0)
-            {
-                // tell friend to update user about friend's presence changes
-                if (!friendpresence.subscriptionData.Contains(userpresence.agentData.AgentID))
-                {
-                    friendpresence.subscriptionData.Add(userpresence.agentData.AgentID);
-                }
-
-                // send an update about friend's presence to user.
-                enqueuePresenceUpdate(friendpresence, userpresence);
-            }
-        }
-
-        /// <summary>
-        /// Logoff Processor.  Call this to clean up agent presence data and send logoff presence notifications
-        /// </summary>
-        /// <param name="AgentID"></param>
-        private void ProcessLogOff(UUID AgentID)
-        {
-            m_log.Info("[LOGOFF]: Processing Logoff");
-
-            UserPresenceData userPresence = null;
-            lock (m_presences)
-            {
-                m_presences.TryGetValue(AgentID, out userPresence);
-            }
-
-            if (userPresence != null) // found the user
-            {
-                List<UUID> AgentsNeedingNotification = userPresence.subscriptionData;
-                userPresence.OnlineYN = false;
-
-                for (int i = 0; i < AgentsNeedingNotification.Count; i++)
-                {
-                    UserPresenceData friendPresence = null;
-                    lock (m_presences)
-                    {
-                        m_presences.TryGetValue(AgentsNeedingNotification[i], out friendPresence);
-                    }
-
-                    // This might need to be enumerated and checked before we try to remove it.
-                    if (friendPresence != null)
-                    {
-                        lock (friendPresence)
-                        {
-                            // no updates for this user anymore
-                            friendPresence.subscriptionData.Remove(AgentID);
-
-                            // set user's entry in the friend's list to offline (if it exists)
-                            if (friendPresence.friendData.ContainsKey(AgentID))
-                            {
-                                friendPresence.friendData[AgentID].onlinestatus = false;
-                            }
-                        }
-
-                        enqueuePresenceUpdate(userPresence, friendPresence);
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        private void PresenceUpdateDone(PresenceInformer obj)
-        {
-            obj.OnGetRegionData -= m_regionModule.GetRegionInfo;
-            obj.OnDone -= PresenceUpdateDone;
-        }
-
-        #region UserServer Comms
-
-        /// <summary>
-        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend
-        /// relationship for UUID friendslistowner. For faster lookup, we index by friend's UUID.
-        /// </summary>
-        /// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param>
-        private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
-
-            try
-            {
-                Hashtable param = new Hashtable();
-                param["ownerID"] = friendlistowner.ToString();
-
-                IList parameters = new ArrayList();
-                parameters.Add(param);
-                XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
-                XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);
-                Hashtable respData = (Hashtable)resp.Value;
-
-                if (respData.Contains("avcount"))
-                {
-                    buddies = ConvertXMLRPCDataToFriendListItemList(respData);
-                }
-
-            }
-            catch (WebException e)
-            {
-                m_log.Warn("Error when trying to fetch Avatar's friends list: " +
-                                      e.Message);
-                // Return Empty list (no friends)
-            }
-            return buddies;
-        }
-
-        /// <summary>
-        /// Converts XMLRPC Friend List to FriendListItem Object
-        /// </summary>
-        /// <param name="data">XMLRPC response data Hashtable</param>
-        /// <returns></returns>
-        public Dictionary<UUID, FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)
-        {
-            Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();
-            int buddycount = Convert.ToInt32((string)data["avcount"]);
-
-            for (int i = 0; i < buddycount; i++)
-            {
-                FriendListItem buddylistitem = new FriendListItem();
-
-                buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
-                buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
-                buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
-                buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
-
-                buddies.Add(buddylistitem.Friend, buddylistitem);
-            }
-
-            return buddies;
-        }
-
-        /// <summary>
-        /// UserServer sends an expect_user method
-        /// this handles the method and provisions the
-        /// necessary info for presence to work
-        /// </summary>
-        /// <param name="request">UserServer Data</param>
-        /// <returns></returns>
-        public XmlRpcResponse UserLoggedOn(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new UUID((string)requestData["sessionid"]);
-            agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
-            agentData.firstname = (string)requestData["firstname"];
-            agentData.lastname = (string)requestData["lastname"];
-            agentData.AgentID = new UUID((string)requestData["agentid"]);
-            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            agentData.CapsPath = (string)requestData["caps_path"];
-
-            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
-            {
-                agentData.child = true;
-            }
-            else
-            {
-                agentData.startpos =
-                     new Vector3(Convert.ToSingle(requestData["positionx"]),
-                                 Convert.ToSingle(requestData["positiony"]),
-                                 Convert.ToSingle(requestData["positionz"]));
-                agentData.child = false;
-            }
-
-            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
-
-            m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",
-                             agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");
-
-            UserPresenceData up = new UserPresenceData();
-            up.agentData = agentData;
-            up.friendData = GetUserFriendList(agentData.AgentID);
-            up.regionData = m_regionModule.GetRegionInfo(regionHandle);
-            up.OnlineYN = true;
-            up.lookupUserRegionYN = false;
-            ProcessFriendListSubscriptions(up);
-
-            return new XmlRpcResponse();
-        }
-
-        /// <summary>
-        /// The UserServer got a Logoff message
-        /// Cleanup time for that user.  Send out presence notifications
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)
-        {
-            m_log.Info("[USERLOGOFF]: User logged off called");
-            Hashtable requestData = (Hashtable)request.Params[0];
-
-            UUID AgentID = new UUID((string)requestData["agentid"]);
-            ProcessLogOff(AgentID);
-
-            return new XmlRpcResponse();
-        }
-
-        #endregion
-
-        public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request)
-        {
-            Hashtable paramHash = (Hashtable)request.Params[0];
-            Hashtable result = new Hashtable();
-
-            // TODO check access (recv_key/send_key)
-
-            IList list = (IList)paramHash["uuids"];
-
-            // convert into List<UUID>
-            List<UUID> uuids = new List<UUID>();
-            for (int i = 0; i < list.Count; ++i)
-            {
-                UUID uuid;
-                if (UUID.TryParse((string)list[i], out uuid))
-                {
-                    uuids.Add(uuid);
-                }
-            }
-
-            try {
-                Dictionary<UUID, FriendRegionInfo> infos = m_userDataBaseService.GetFriendRegionInfos(uuids);
-                m_log.DebugFormat("[FRIEND]: Got {0} region entries back.", infos.Count);
-                int count = 0;
-                foreach (KeyValuePair<UUID, FriendRegionInfo> pair in infos)
-                {
-                    result["uuid_" + count] = pair.Key.ToString();
-                    result["isOnline_" + count] = pair.Value.isOnline;
-                    result["regionHandle_" + count] = pair.Value.regionHandle.ToString(); // XML-RPC doesn't know ulongs
-                    ++count;
-                }
-                result["count"] = count;
-
-                XmlRpcResponse response = new XmlRpcResponse();
-                response.Value = result;
-                return response;
-            }
-            catch(Exception e) {
-                m_log.Error("Got exception:", e);
-                throw e;
-            }
-        }
-
-        public XmlRpcResponse AgentLocation(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable result = new Hashtable();
-            result["success"] = "FALSE";
-
-            if (m_userServerModule.SendToUserServer(requestData, "agent_location"))
-                result["success"] = "TRUE";
-
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = result;
-            return response;
-        }
-
-        public XmlRpcResponse AgentLeaving(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable result = new Hashtable();
-            result["success"] = "FALSE";
-
-            if (m_userServerModule.SendToUserServer(requestData, "agent_leaving"))
-                result["success"] = "TRUE";
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = result;
-            return response;
-        }
-
-        public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request)
-        {
-            Hashtable requestData = (Hashtable)request.Params[0];
-            Hashtable result = new Hashtable();
-            result["success"] = "FALSE";
-
-            UUID regionID;
-            if (UUID.TryParse((string)requestData["regionid"], out regionID))
-            {
-                m_log.DebugFormat("[PRESENCE] Processing region restart for {0}", regionID);
-                result["success"] = "TRUE";
-
-                foreach (UserPresenceData up in m_presences.Values)
-                {
-                    if (up.regionData.UUID == regionID)
-                    {
-                        if (up.OnlineYN)
-                        {
-                            m_log.DebugFormat("[PRESENCE] Logging off {0} because the region they were in has gone", up.agentData.AgentID);
-                            ProcessLogOff(up.agentData.AgentID);
-                        }
-                    }
-                }
-            }
-
-            XmlRpcResponse response = new XmlRpcResponse();
-            response.Value = result;
-            return response;
-        }
-    }
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Reflection;

+using System.Threading;

+using System.Timers;

+using log4net;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Data;

+using OpenSim.Framework;

+using OpenSim.Grid.Framework;

+using Timer=System.Timers.Timer;

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public class MessageService

+    {

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+

+        private MessageServerConfig m_cfg;

+        private UserDataBaseService m_userDataBaseService;

+

+        private IUGAIMCore m_messageCore;

+

+        private IMessageUserServerService m_userServerModule;

+        private IMessageRegionService m_regionModule;

+

+        // a dictionary of all current presences this server knows about

+        private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>();

+

+        public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService)

+        {

+            m_cfg = cfg;

+            m_messageCore = messageCore;

+

+            m_userDataBaseService = userDataBaseService;

+

+            //??? 

+            UserConfig uc = new UserConfig();

+            uc.DatabaseConnect = cfg.DatabaseConnect;

+            uc.DatabaseProvider = cfg.DatabaseProvider;

+        }

+

+        public void Initialise()

+        {

+        }

+  

+        public void PostInitialise()

+        {

+            IMessageUserServerService messageUserServer;

+            if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer))

+            {

+                m_userServerModule = messageUserServer;

+            }

+

+            IMessageRegionService messageRegion;

+            if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion))

+            {

+                m_regionModule = messageRegion;

+            }

+        }

+

+        public void RegisterHandlers()

+        {

+            //have these in separate method as some servers restart the http server and reregister all the handlers.

+

+        }

+

+        #region FriendList Methods

+

+        /// <summary>

+        /// Process Friendlist subscriptions for a user

+        /// The login method calls this for a User

+        /// </summary>

+        /// <param name="userpresence">The Agent we're processing the friendlist subscriptions for</param>

+        private void ProcessFriendListSubscriptions(UserPresenceData userpresence)

+        {

+            lock (m_presences)

+            {

+                m_presences[userpresence.agentData.AgentID] = userpresence;

+            }

+

+            Dictionary<UUID, FriendListItem> uFriendList = userpresence.friendData;

+            foreach (KeyValuePair<UUID, FriendListItem> pair in uFriendList)

+            {

+                UserPresenceData friendup = null;

+                lock (m_presences)

+                {

+                    m_presences.TryGetValue(pair.Key, out friendup);

+                }

+                if (friendup != null)

+                {

+                    SubscribeToPresenceUpdates(userpresence, friendup, pair.Value);

+                }

+            }

+        }

+

+        /// <summary>

+        /// Enqueues a presence update, sending info about user 'talkingAbout' to user 'receiver'.

+        /// </summary>

+        /// <param name="talkingAbout">We are sending presence information about this user.</param>

+        /// <param name="receiver">We are sending the presence update to this user</param>

+        private void enqueuePresenceUpdate(UserPresenceData talkingAbout, UserPresenceData receiver)

+        {

+            UserAgentData p2Handle = m_userDataBaseService.GetUserAgentData(receiver.agentData.AgentID);

+            if (p2Handle != null)

+            {

+                if (receiver.lookupUserRegionYN)

+                {

+                    receiver.regionData.regionHandle = p2Handle.Handle;

+                }

+                else

+                {

+                    receiver.lookupUserRegionYN = true; // TODO Huh?

+                }

+

+                PresenceInformer friendlistupdater = new PresenceInformer();

+                friendlistupdater.presence1 = talkingAbout;

+                friendlistupdater.presence2 = receiver;

+                friendlistupdater.OnGetRegionData += m_regionModule.GetRegionInfo;

+                friendlistupdater.OnDone += PresenceUpdateDone;

+                WaitCallback cb = new WaitCallback(friendlistupdater.go);

+                ThreadPool.QueueUserWorkItem(cb);

+            }

+            else

+            {

+                m_log.WarnFormat("no data found for user {0}", receiver.agentData.AgentID);

+                // Skip because we can't find any data on the user

+            }

+        }

+

+        /// <summary>

+        /// Does the necessary work to subscribe one agent to another's presence notifications

+        /// Gets called by ProcessFriendListSubscriptions.  You shouldn't call this directly

+        /// unless you know what you're doing

+        /// </summary>

+        /// <param name="userpresence">P1</param>

+        /// <param name="friendpresence">P2</param>

+        /// <param name="uFriendListItem"></param>

+        private void SubscribeToPresenceUpdates(UserPresenceData userpresence,

+                                               UserPresenceData friendpresence,

+                                               FriendListItem uFriendListItem)

+        {

+            // Can the friend see me online?

+            if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)

+            {

+                // tell user to update friend about user's presence changes

+                if (!userpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))

+                {

+                   userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);

+                }

+

+                // send an update about user's presence to the friend

+                enqueuePresenceUpdate(userpresence, friendpresence);

+            }

+

+            // Can I see the friend online?

+            if ((uFriendListItem.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0)

+            {

+                // tell friend to update user about friend's presence changes

+                if (!friendpresence.subscriptionData.Contains(userpresence.agentData.AgentID))

+                {

+                    friendpresence.subscriptionData.Add(userpresence.agentData.AgentID);

+                }

+

+                // send an update about friend's presence to user.

+                enqueuePresenceUpdate(friendpresence, userpresence);

+            }

+        }

+

+        /// <summary>

+        /// Logoff Processor.  Call this to clean up agent presence data and send logoff presence notifications

+        /// </summary>

+        /// <param name="AgentID"></param>

+        private void ProcessLogOff(UUID AgentID)

+        {

+            m_log.Info("[LOGOFF]: Processing Logoff");

+

+            UserPresenceData userPresence = null;

+            lock (m_presences)

+            {

+                m_presences.TryGetValue(AgentID, out userPresence);

+            }

+

+            if (userPresence != null) // found the user

+            {

+                List<UUID> AgentsNeedingNotification = userPresence.subscriptionData;

+                userPresence.OnlineYN = false;

+

+                for (int i = 0; i < AgentsNeedingNotification.Count; i++)

+                {

+                    UserPresenceData friendPresence = null;

+                    lock (m_presences)

+                    {

+                        m_presences.TryGetValue(AgentsNeedingNotification[i], out friendPresence);

+                    }

+

+                    // This might need to be enumerated and checked before we try to remove it.

+                    if (friendPresence != null)

+                    {

+                        lock (friendPresence)

+                        {

+                            // no updates for this user anymore

+                            friendPresence.subscriptionData.Remove(AgentID);

+

+                            // set user's entry in the friend's list to offline (if it exists)

+                            if (friendPresence.friendData.ContainsKey(AgentID))

+                            {

+                                friendPresence.friendData[AgentID].onlinestatus = false;

+                            }

+                        }

+

+                        enqueuePresenceUpdate(userPresence, friendPresence);

+                    }

+                }

+            }

+        }

+

+        #endregion

+

+        private void PresenceUpdateDone(PresenceInformer obj)

+        {

+            obj.OnGetRegionData -= m_regionModule.GetRegionInfo;

+            obj.OnDone -= PresenceUpdateDone;

+        }

+

+        #region UserServer Comms

+

+        /// <summary>

+        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend

+        /// relationship for UUID friendslistowner. For faster lookup, we index by friend's UUID.

+        /// </summary>

+        /// <param name="friendlistowner">The agent that we're retreiving the friends Data for.</param>

+        private Dictionary<UUID, FriendListItem> GetUserFriendList(UUID friendlistowner)

+        {

+            Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();

+

+            try

+            {

+                Hashtable param = new Hashtable();

+                param["ownerID"] = friendlistowner.ToString();

+

+                IList parameters = new ArrayList();

+                parameters.Add(param);

+                XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);

+                XmlRpcResponse resp = req.Send(m_cfg.UserServerURL, 3000);

+                Hashtable respData = (Hashtable)resp.Value;

+

+                if (respData.Contains("avcount"))

+                {

+                    buddies = ConvertXMLRPCDataToFriendListItemList(respData);

+                }

+

+            }

+            catch (WebException e)

+            {

+                m_log.Warn("Error when trying to fetch Avatar's friends list: " +

+                                      e.Message);

+                // Return Empty list (no friends)

+            }

+            return buddies;

+        }

+

+        /// <summary>

+        /// Converts XMLRPC Friend List to FriendListItem Object

+        /// </summary>

+        /// <param name="data">XMLRPC response data Hashtable</param>

+        /// <returns></returns>

+        public Dictionary<UUID, FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)

+        {

+            Dictionary<UUID, FriendListItem> buddies = new Dictionary<UUID,FriendListItem>();

+            int buddycount = Convert.ToInt32((string)data["avcount"]);

+

+            for (int i = 0; i < buddycount; i++)

+            {

+                FriendListItem buddylistitem = new FriendListItem();

+

+                buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);

+                buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);

+                buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);

+                buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);

+

+                buddies.Add(buddylistitem.Friend, buddylistitem);

+            }

+

+            return buddies;

+        }

+

+        /// <summary>

+        /// UserServer sends an expect_user method

+        /// this handles the method and provisions the

+        /// necessary info for presence to work

+        /// </summary>

+        /// <param name="request">UserServer Data</param>

+        /// <returns></returns>

+        public XmlRpcResponse UserLoggedOn(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+

+            AgentCircuitData agentData = new AgentCircuitData();

+            agentData.SessionID = new UUID((string)requestData["sessionid"]);

+            agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);

+            agentData.firstname = (string)requestData["firstname"];

+            agentData.lastname = (string)requestData["lastname"];

+            agentData.AgentID = new UUID((string)requestData["agentid"]);

+            agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);

+            agentData.CapsPath = (string)requestData["caps_path"];

+

+            if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))

+            {

+                agentData.child = true;

+            }

+            else

+            {

+                agentData.startpos =

+                     new Vector3(Convert.ToSingle(requestData["positionx"]),

+                                 Convert.ToSingle(requestData["positiony"]),

+                                 Convert.ToSingle(requestData["positionz"]));

+                agentData.child = false;

+            }

+

+            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);

+

+            m_log.InfoFormat("[LOGON]: User {0} {1} logged into region {2} as {3} agent, building indexes for user",

+                             agentData.firstname, agentData.lastname, regionHandle, agentData.child ? "child" : "root");

+

+            UserPresenceData up = new UserPresenceData();

+            up.agentData = agentData;

+            up.friendData = GetUserFriendList(agentData.AgentID);

+            up.regionData = m_regionModule.GetRegionInfo(regionHandle);

+            up.OnlineYN = true;

+            up.lookupUserRegionYN = false;

+            ProcessFriendListSubscriptions(up);

+

+            return new XmlRpcResponse();

+        }

+

+        /// <summary>

+        /// The UserServer got a Logoff message

+        /// Cleanup time for that user.  Send out presence notifications

+        /// </summary>

+        /// <param name="request"></param>

+        /// <returns></returns>

+        public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)

+        {

+            m_log.Info("[USERLOGOFF]: User logged off called");

+            Hashtable requestData = (Hashtable)request.Params[0];

+

+            UUID AgentID = new UUID((string)requestData["agentid"]);

+            ProcessLogOff(AgentID);

+

+            return new XmlRpcResponse();

+        }

+

+        #endregion

+

+        public XmlRpcResponse GetPresenceInfoBulk(XmlRpcRequest request)

+        {

+            Hashtable paramHash = (Hashtable)request.Params[0];

+            Hashtable result = new Hashtable();

+

+            // TODO check access (recv_key/send_key)

+

+            IList list = (IList)paramHash["uuids"];

+

+            // convert into List<UUID>

+            List<UUID> uuids = new List<UUID>();

+            for (int i = 0; i < list.Count; ++i)

+            {

+                UUID uuid;

+                if (UUID.TryParse((string)list[i], out uuid))

+                {

+                    uuids.Add(uuid);

+                }

+            }

+

+            try {

+                Dictionary<UUID, FriendRegionInfo> infos = m_userDataBaseService.GetFriendRegionInfos(uuids);

+                m_log.DebugFormat("[FRIEND]: Got {0} region entries back.", infos.Count);

+                int count = 0;

+                foreach (KeyValuePair<UUID, FriendRegionInfo> pair in infos)

+                {

+                    result["uuid_" + count] = pair.Key.ToString();

+                    result["isOnline_" + count] = pair.Value.isOnline;

+                    result["regionHandle_" + count] = pair.Value.regionHandle.ToString(); // XML-RPC doesn't know ulongs

+                    ++count;

+                }

+                result["count"] = count;

+

+                XmlRpcResponse response = new XmlRpcResponse();

+                response.Value = result;

+                return response;

+            }

+            catch(Exception e) {

+                m_log.Error("Got exception:", e);

+                throw e;

+            }

+        }

+

+        public XmlRpcResponse AgentLocation(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+            Hashtable result = new Hashtable();

+            result["success"] = "FALSE";

+

+            if (m_userServerModule.SendToUserServer(requestData, "agent_location"))

+                result["success"] = "TRUE";

+

+

+            XmlRpcResponse response = new XmlRpcResponse();

+            response.Value = result;

+            return response;

+        }

+

+        public XmlRpcResponse AgentLeaving(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+            Hashtable result = new Hashtable();

+            result["success"] = "FALSE";

+

+            if (m_userServerModule.SendToUserServer(requestData, "agent_leaving"))

+                result["success"] = "TRUE";

+

+            XmlRpcResponse response = new XmlRpcResponse();

+            response.Value = result;

+            return response;

+        }

+

+        public XmlRpcResponse ProcessRegionShutdown(XmlRpcRequest request)

+        {

+            Hashtable requestData = (Hashtable)request.Params[0];

+            Hashtable result = new Hashtable();

+            result["success"] = "FALSE";

+

+            UUID regionID;

+            if (UUID.TryParse((string)requestData["regionid"], out regionID))

+            {

+                m_log.DebugFormat("[PRESENCE] Processing region restart for {0}", regionID);

+                result["success"] = "TRUE";

+

+                foreach (UserPresenceData up in m_presences.Values)

+                {

+                    if (up.regionData.UUID == regionID)

+                    {

+                        if (up.OnlineYN)

+                        {

+                            m_log.DebugFormat("[PRESENCE] Logging off {0} because the region they were in has gone", up.agentData.AgentID);

+                            ProcessLogOff(up.agentData.AgentID);

+                        }

+                    }

+                }

+            }

+

+            XmlRpcResponse response = new XmlRpcResponse();

+            response.Value = result;

+            return response;

+        }

+    }

 }
\ No newline at end of file
diff --git a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs
index a97107c..9293b3e 100644
--- a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs
@@ -1,186 +1,186 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Timers;
-using log4net;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Grid.Framework;
-using Timer = System.Timers.Timer;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    public class MessageUserServerModule : IMessageUserServerService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MessageServerConfig m_cfg;
-
-        private IUGAIMCore m_messageCore;
-
-        private Timer reconnectTimer = new Timer(300000); // 5 mins
-
-        public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore)
-        {
-            m_cfg = config;
-            m_messageCore = messageCore;
-
-            reconnectTimer.Elapsed += registerWithUserServer;
-            reconnectTimer.Start();
-        }
-
-        public void Initialise()
-        {
-            m_messageCore.RegisterInterface<IMessageUserServerService>(this);
-        }
-
-        public void PostInitialise()
-        {
-
-        }
-
-        public void RegisterHandlers()
-        {
-            //have these in separate method as some servers restart the http server and reregister all the handlers.
-           
-        }
-
-        public void registerWithUserServer(object sender, ElapsedEventArgs e)
-        {
-            registerWithUserServer();
-        }
-
-        public bool registerWithUserServer()
-        {
-            Hashtable UserParams = new Hashtable();
-            // Login / Authentication
-
-            if (m_cfg.HttpSSL)
-            {
-                UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
-            }
-            else
-            {
-                UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
-            }
-
-            UserParams["recvkey"] = m_cfg.UserRecvKey;
-            UserParams["sendkey"] = m_cfg.UserRecvKey;
-
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(UserParams);
-
-            bool success = true;
-            string[] servers = m_cfg.UserServerURL.Split(' ');
-
-            foreach (string srv in servers)
-            {
-                // Send Request
-                try
-                {
-                    XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
-                    XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
-
-                    // Process Response
-                    Hashtable GridRespData = (Hashtable)UserResp.Value;
-                    // if we got a response, we were successful
-                    if (!GridRespData.ContainsKey("responsestring"))
-                        success = false;
-                    else
-                        m_log.InfoFormat("[SERVER] Registered with {0}", srv);
-                }
-                catch
-                {
-                    m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
-                    success = false;
-                }
-            }
-            return success;
-        }
-
-        public bool deregisterWithUserServer()
-        {
-            Hashtable request = new Hashtable();
-
-            return SendToUserServer(request, "deregister_messageserver");
-        }
-
-        public bool SendToUserServer(Hashtable request, string method)
-        {
-            // Login / Authentication
-
-            if (m_cfg.HttpSSL)
-            {
-                request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
-            }
-            else
-            {
-                request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
-            }
-
-            request["recvkey"] = m_cfg.UserRecvKey;
-            request["sendkey"] = m_cfg.UserRecvKey;
-
-            // Package into an XMLRPC Request
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(request);
-
-            bool success = true;
-            string[] servers = m_cfg.UserServerURL.Split(' ');
-
-            // Send Request
-            foreach (string srv in servers)
-            {
-                try
-                {
-                    XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);
-                    XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);
-                    // Process Response
-                    Hashtable UserRespData = (Hashtable)UserResp.Value;
-                    // if we got a response, we were successful
-                    if (!UserRespData.ContainsKey("responsestring"))
-                        success = false;
-                }
-                catch
-                {
-                    m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
-                    success = false;
-                }
-            }
-            return success;
-        }
-    }
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Net;

+using System.Reflection;

+using System.Threading;

+using System.Timers;

+using log4net;

+using Nwc.XmlRpc;

+using OpenMetaverse;

+using OpenSim.Data;

+using OpenSim.Framework;

+using OpenSim.Grid.Framework;

+using Timer = System.Timers.Timer;

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public class MessageUserServerModule : IMessageUserServerService

+    {

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+

+        private MessageServerConfig m_cfg;

+

+        private IUGAIMCore m_messageCore;

+

+        private Timer reconnectTimer = new Timer(300000); // 5 mins

+

+        public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore)

+        {

+            m_cfg = config;

+            m_messageCore = messageCore;

+

+            reconnectTimer.Elapsed += registerWithUserServer;

+            reconnectTimer.Start();

+        }

+

+        public void Initialise()

+        {

+            m_messageCore.RegisterInterface<IMessageUserServerService>(this);

+        }

+

+        public void PostInitialise()

+        {

+

+        }

+

+        public void RegisterHandlers()

+        {

+            //have these in separate method as some servers restart the http server and reregister all the handlers.

+           

+        }

+

+        public void registerWithUserServer(object sender, ElapsedEventArgs e)

+        {

+            registerWithUserServer();

+        }

+

+        public bool registerWithUserServer()

+        {

+            Hashtable UserParams = new Hashtable();

+            // Login / Authentication

+

+            if (m_cfg.HttpSSL)

+            {

+                UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;

+            }

+            else

+            {

+                UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;

+            }

+

+            UserParams["recvkey"] = m_cfg.UserRecvKey;

+            UserParams["sendkey"] = m_cfg.UserRecvKey;

+

+            // Package into an XMLRPC Request

+            ArrayList SendParams = new ArrayList();

+            SendParams.Add(UserParams);

+

+            bool success = true;

+            string[] servers = m_cfg.UserServerURL.Split(' ');

+

+            foreach (string srv in servers)

+            {

+                // Send Request

+                try

+                {

+                    XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);

+                    XmlRpcResponse UserResp = UserReq.Send(srv, 16000);

+

+                    // Process Response

+                    Hashtable GridRespData = (Hashtable)UserResp.Value;

+                    // if we got a response, we were successful

+                    if (!GridRespData.ContainsKey("responsestring"))

+                        success = false;

+                    else

+                        m_log.InfoFormat("[SERVER] Registered with {0}", srv);

+                }

+                catch

+                {

+                    m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);

+                    success = false;

+                }

+            }

+            return success;

+        }

+

+        public bool deregisterWithUserServer()

+        {

+            Hashtable request = new Hashtable();

+

+            return SendToUserServer(request, "deregister_messageserver");

+        }

+

+        public bool SendToUserServer(Hashtable request, string method)

+        {

+            // Login / Authentication

+

+            if (m_cfg.HttpSSL)

+            {

+                request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;

+            }

+            else

+            {

+                request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;

+            }

+

+            request["recvkey"] = m_cfg.UserRecvKey;

+            request["sendkey"] = m_cfg.UserRecvKey;

+

+            // Package into an XMLRPC Request

+            ArrayList SendParams = new ArrayList();

+            SendParams.Add(request);

+

+            bool success = true;

+            string[] servers = m_cfg.UserServerURL.Split(' ');

+

+            // Send Request

+            foreach (string srv in servers)

+            {

+                try

+                {

+                    XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);

+                    XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);

+                    // Process Response

+                    Hashtable UserRespData = (Hashtable)UserResp.Value;

+                    // if we got a response, we were successful

+                    if (!UserRespData.ContainsKey("responsestring"))

+                        success = false;

+                }

+                catch

+                {

+                    m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);

+                    success = false;

+                }

+            }

+            return success;

+        }

+    }

+}

diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer.Modules/PresenceBackreferenceEntry.cs
index 08566bb..b6023e3 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/PresenceBackreferenceEntry.cs
@@ -1,96 +1,96 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using OpenMetaverse;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    // This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.
-    public class PresenceBackreferenceEntry
-    {
-        List<UUID> AgentList = new List<UUID>();
-
-        public PresenceBackreferenceEntry()
-        {
-
-        }
-
-        public void Add(UUID item)
-        {
-            lock (AgentList)
-            {
-                AgentList.Add(item);
-            }
-        }
-
-        public UUID getitem(int index)
-        {
-            UUID result = UUID.Zero;
-            lock (AgentList)
-            {
-                if (index > 0 && index < AgentList.Count)
-                {
-                    result = AgentList[index];
-                }
-            }
-            return result;
-        }
-
-        public int Count
-        {
-            get
-            {
-                int count = 0;
-                lock (AgentList)
-                {
-                    count = AgentList.Count;
-                }
-                return count;
-            }
-        }
-
-        public void Remove(UUID item)
-        {
-            lock (AgentList)
-            {
-                if (AgentList.Contains(item))
-                    AgentList.Remove(item);
-            }
-        }
-
-        public bool contains(UUID item)
-        {
-            bool result = false;
-            lock (AgentList)
-            {
-                result = AgentList.Contains(item);
-            }
-            return result;
-        }
-    }
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System.Collections.Generic;

+using OpenMetaverse;

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    // This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.

+    public class PresenceBackreferenceEntry

+    {

+        List<UUID> AgentList = new List<UUID>();

+

+        public PresenceBackreferenceEntry()

+        {

+

+        }

+

+        public void Add(UUID item)

+        {

+            lock (AgentList)

+            {

+                AgentList.Add(item);

+            }

+        }

+

+        public UUID getitem(int index)

+        {

+            UUID result = UUID.Zero;

+            lock (AgentList)

+            {

+                if (index > 0 && index < AgentList.Count)

+                {

+                    result = AgentList[index];

+                }

+            }

+            return result;

+        }

+

+        public int Count

+        {

+            get

+            {

+                int count = 0;

+                lock (AgentList)

+                {

+                    count = AgentList.Count;

+                }

+                return count;

+            }

+        }

+

+        public void Remove(UUID item)

+        {

+            lock (AgentList)

+            {

+                if (AgentList.Contains(item))

+                    AgentList.Remove(item);

+            }

+        }

+

+        public bool contains(UUID item)

+        {

+            bool result = false;

+            lock (AgentList)

+            {

+                result = AgentList.Contains(item);

+            }

+            return result;

+        }

+    }

+}

diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer.Modules/PresenceInformer.cs
index a8c98f6..5d13c1b 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/PresenceInformer.cs
@@ -1,135 +1,135 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections;
-using System.Net;
-using System.Reflection;
-using log4net;
-using Nwc.XmlRpc;
-using OpenSim.Data;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    public delegate RegionProfileData GetRegionData(ulong region_handle);
-    public delegate void Done(PresenceInformer obj);
-
-
-    public class PresenceInformer
-    {
-        public event GetRegionData OnGetRegionData;
-        public event Done OnDone;
-
-        private GetRegionData handlerGetRegionData = null;
-        private Done handlerDone = null;
-
-        public UserPresenceData presence1 = null;
-        public UserPresenceData presence2 = null;
-        public string gridserverurl, gridserversendkey, gridserverrecvkey;
-        public bool lookupRegion = true;
-        //public methodGroup
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public PresenceInformer()
-        {
-
-        }
-        public void go(object o)
-        {
-            if (presence1 != null && presence2 != null)
-            {
-                SendRegionPresenceUpdate(presence1, presence2);
-            }
-
-        }
-
-        /// <summary>
-        /// Informs a region about an Agent
-        /// </summary>
-        /// <param name="TalkingAbout">User to talk about</param>
-        /// <param name="UserToUpdate">User we're sending this too (contains the region)</param>
-        public void SendRegionPresenceUpdate(UserPresenceData TalkingAbout, UserPresenceData UserToUpdate)
-        {
-            // TODO: Fill in pertenant Presence Data from 'TalkingAbout'
-            RegionProfileData whichRegion = new RegionProfileData();
-            if (lookupRegion)
-            {
-                handlerGetRegionData = OnGetRegionData;
-                if (handlerGetRegionData != null)
-                {
-                    whichRegion = handlerGetRegionData(UserToUpdate.regionData.regionHandle);
-                }
-                //RegionProfileData rp = RegionProfileData.RequestSimProfileData(UserToUpdate.regionData.regionHandle, gridserverurl, gridserversendkey, gridserverrecvkey);
-
-                //whichRegion = rp;
-            }
-            else
-            {
-                whichRegion = UserToUpdate.regionData;
-            }
-            //whichRegion.httpServerURI
-
-            if (whichRegion != null)
-            {
-                Hashtable PresenceParams = new Hashtable();
-                PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString());
-                PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());
-                if (TalkingAbout.OnlineYN)
-                    PresenceParams.Add("status","TRUE");
-                else
-                    PresenceParams.Add("status","FALSE");
-
-                ArrayList SendParams = new ArrayList();
-                SendParams.Add(PresenceParams);
-
-                m_log.InfoFormat("[PRESENCE]: Informing {0}@{1} at {2} about {3}", TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname, whichRegion.regionName, whichRegion.httpServerURI, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname);
-                // Send
-                XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams);
-                try
-                {
-                    // XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
-                    RegionReq.Send(whichRegion.httpServerURI, 6000);
-                }
-                catch (WebException)
-                {
-                    m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname);
-                }
-            }
-            else
-            {
-                m_log.Info("[PRESENCEUPDATER]: Region data was null skipping");
-
-            }
-
-            handlerDone = OnDone;
-            if (handlerDone != null)
-            {
-                handlerDone(this);
-            }
-        }
-    }
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System.Collections;

+using System.Net;

+using System.Reflection;

+using log4net;

+using Nwc.XmlRpc;

+using OpenSim.Data;

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public delegate RegionProfileData GetRegionData(ulong region_handle);

+    public delegate void Done(PresenceInformer obj);

+

+

+    public class PresenceInformer

+    {

+        public event GetRegionData OnGetRegionData;

+        public event Done OnDone;

+

+        private GetRegionData handlerGetRegionData = null;

+        private Done handlerDone = null;

+

+        public UserPresenceData presence1 = null;

+        public UserPresenceData presence2 = null;

+        public string gridserverurl, gridserversendkey, gridserverrecvkey;

+        public bool lookupRegion = true;

+        //public methodGroup

+

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+

+        public PresenceInformer()

+        {

+

+        }

+        public void go(object o)

+        {

+            if (presence1 != null && presence2 != null)

+            {

+                SendRegionPresenceUpdate(presence1, presence2);

+            }

+

+        }

+

+        /// <summary>

+        /// Informs a region about an Agent

+        /// </summary>

+        /// <param name="TalkingAbout">User to talk about</param>

+        /// <param name="UserToUpdate">User we're sending this too (contains the region)</param>

+        public void SendRegionPresenceUpdate(UserPresenceData TalkingAbout, UserPresenceData UserToUpdate)

+        {

+            // TODO: Fill in pertenant Presence Data from 'TalkingAbout'

+            RegionProfileData whichRegion = new RegionProfileData();

+            if (lookupRegion)

+            {

+                handlerGetRegionData = OnGetRegionData;

+                if (handlerGetRegionData != null)

+                {

+                    whichRegion = handlerGetRegionData(UserToUpdate.regionData.regionHandle);

+                }

+                //RegionProfileData rp = RegionProfileData.RequestSimProfileData(UserToUpdate.regionData.regionHandle, gridserverurl, gridserversendkey, gridserverrecvkey);

+

+                //whichRegion = rp;

+            }

+            else

+            {

+                whichRegion = UserToUpdate.regionData;

+            }

+            //whichRegion.httpServerURI

+

+            if (whichRegion != null)

+            {

+                Hashtable PresenceParams = new Hashtable();

+                PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString());

+                PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());

+                if (TalkingAbout.OnlineYN)

+                    PresenceParams.Add("status","TRUE");

+                else

+                    PresenceParams.Add("status","FALSE");

+

+                ArrayList SendParams = new ArrayList();

+                SendParams.Add(PresenceParams);

+

+                m_log.InfoFormat("[PRESENCE]: Informing {0}@{1} at {2} about {3}", TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname, whichRegion.regionName, whichRegion.httpServerURI, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname);

+                // Send

+                XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams);

+                try

+                {

+                    // XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);

+                    RegionReq.Send(whichRegion.httpServerURI, 6000);

+                }

+                catch (WebException)

+                {

+                    m_log.WarnFormat("[INFORM]: failed notifying region {0} containing user {1} about {2}", whichRegion.regionName, UserToUpdate.agentData.firstname + " " + UserToUpdate.agentData.lastname, TalkingAbout.agentData.firstname + " " + TalkingAbout.agentData.lastname);

+                }

+            }

+            else

+            {

+                m_log.Info("[PRESENCEUPDATER]: Region data was null skipping");

+

+            }

+

+            handlerDone = OnDone;

+            if (handlerDone != null)

+            {

+                handlerDone(this);

+            }

+        }

+    }

+}

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    class PresenceService

+    {

+    }

+}

diff --git a/OpenSim/Grid/MessagingServer/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
index 32d5e61..ee1da86 100644
--- a/OpenSim/Grid/MessagingServer/UserDataBaseService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
@@ -1,75 +1,75 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    public class UserDataBaseService : UserManagerBase
-    {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// Passing null to parent because we never use any function that requires an interservice inventory call.
-        public UserDataBaseService()
-            : base(null)
-        {
-        }
-        
-        public UserAgentData GetUserAgentData(UUID AgentID)
-        {
-            UserProfileData userProfile = GetUserProfile(AgentID);
-
-            if (userProfile != null)
-            {
-                return userProfile.CurrentAgent;
-            }
-
-            return null;
-        }
-
-        public override UserProfileData SetupMasterUser(string firstName, string lastName)
-        {
-            //throw new Exception("The method or operation is not implemented.");
-            return null;
-        }
-
-        public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
-        {
-            //throw new Exception("The method or operation is not implemented.");
-            return null;
-        }
-
-        public override UserProfileData SetupMasterUser(UUID uuid)
-        {
-            //throw new Exception("The method or operation is not implemented.");
-            return null;
-        }
-    }
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications;

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public class UserDataBaseService : UserManagerBase

+    {

+        /// <summary>

+        /// Constructor.

+        /// </summary>

+        /// Passing null to parent because we never use any function that requires an interservice inventory call.

+        public UserDataBaseService()

+            : base(null)

+        {

+        }

+        

+        public UserAgentData GetUserAgentData(UUID AgentID)

+        {

+            UserProfileData userProfile = GetUserProfile(AgentID);

+

+            if (userProfile != null)

+            {

+                return userProfile.CurrentAgent;

+            }

+

+            return null;

+        }

+

+        public override UserProfileData SetupMasterUser(string firstName, string lastName)

+        {

+            //throw new Exception("The method or operation is not implemented.");

+            return null;

+        }

+

+        public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)

+        {

+            //throw new Exception("The method or operation is not implemented.");

+            return null;

+        }

+

+        public override UserProfileData SetupMasterUser(UUID uuid)

+        {

+            //throw new Exception("The method or operation is not implemented.");

+            return null;

+        }

+    }

+}

diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer.Modules/UserPresenceData.cs
index d548fc6..2b56fe8 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/UserPresenceData.cs
@@ -1,50 +1,50 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Data;
-using OpenSim.Framework;
-
-namespace OpenSim.Grid.MessagingServer
-{
-    public class UserPresenceData
-    {
-        public AgentCircuitData agentData = new AgentCircuitData();
-        public RegionProfileData regionData = new RegionProfileData();
-        public string httpURI = String.Empty;
-        public Dictionary<UUID, FriendListItem> friendData = new Dictionary<UUID,FriendListItem>();
-        public List<UUID> subscriptionData = new List<UUID>();
-        public bool OnlineYN = true;
-        public bool lookupUserRegionYN = true;
-
-        public UserPresenceData()
-        {
-        }
-    }
-}
+/*

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+using System;

+using System.Collections.Generic;

+using OpenMetaverse;

+using OpenSim.Data;

+using OpenSim.Framework;

+

+namespace OpenSim.Grid.MessagingServer

+{

+    public class UserPresenceData

+    {

+        public AgentCircuitData agentData = new AgentCircuitData();

+        public RegionProfileData regionData = new RegionProfileData();

+        public string httpURI = String.Empty;

+        public Dictionary<UUID, FriendListItem> friendData = new Dictionary<UUID,FriendListItem>();

+        public List<UUID> subscriptionData = new List<UUID>();

+        public bool OnlineYN = true;

+        public bool lookupUserRegionYN = true;

+

+        public UserPresenceData()

+        {

+        }

+    }

+}

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public class WorkUnitBase

+    {

+    }

+}

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ *

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

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

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

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

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

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

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

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

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

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

+ */

+

+namespace OpenSim.Grid.MessagingServer.Modules

+{

+    public class WorkUnitPresenceUpdate : WorkUnitBase

+    {

+    }

+}

diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 43d1af9..420e8d5 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Grid.Framework;
+using OpenSim.Grid.MessagingServer.Modules;
 
 namespace OpenSim.Grid.MessagingServer
 {
diff --git a/prebuild.xml b/prebuild.xml
index 21b3729..6fad329 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1033,6 +1033,39 @@
       </Files>
     </Project>
 
+    <Project name="OpenSim.Grid.MessagingServer.Modules" path="OpenSim/Grid/MessagingServer.Modules" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Xml"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Grid.Framework"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="log4net.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
     <Project name="OpenSim.Grid.MessagingServer" path="OpenSim/Grid/MessagingServer" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -1055,6 +1088,7 @@
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Grid.Framework"/>
+      <Reference name="OpenSim.Grid.MessagingServer.Modules"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="XMLRPC.dll"/>