Some cleaning up in the MesssagingServer and GridServer.

3 files changed, 3 insertions, 83 deletions

diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index f09d360..e64d0ca 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -127,6 +127,9 @@ namespace OpenSim.Grid.MessagingServer
             m_userDataBaseService = new UserDataBaseService();
             m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
 
+            //Register the database access service so modules can fetch it
+           // RegisterInterface<UserDataBaseService>(m_userDataBaseService);
+
             m_userServerModule = new MessageUserServerModule(Cfg, this);
             m_userServerModule.Initialise();
 
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 20342ab..a8c98f6 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -95,8 +95,6 @@ namespace OpenSim.Grid.MessagingServer
 
             if (whichRegion != null)
             {
-
-
                 Hashtable PresenceParams = new Hashtable();
                 PresenceParams.Add("agent_id",TalkingAbout.agentData.AgentID.ToString());
                 PresenceParams.Add("notify_id",UserToUpdate.agentData.AgentID.ToString());
@@ -105,19 +103,14 @@ namespace OpenSim.Grid.MessagingServer
                 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);
                 }
@@ -137,7 +130,6 @@ namespace OpenSim.Grid.MessagingServer
             {
                 handlerDone(this);
             }
-
         }
     }
 }
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs
deleted file mode 100644
index 4b07df7..0000000
--- a/OpenSim/Grid/MessagingServer/UserManager.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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
-{
-    class UserManager : UserManagerBase
-    {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// Passing null to parent because we never use any function that requires an interservice inventory call.
-        public UserManager()
-            : 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;
-        }
-    }
-}