* Converted a number of methods within the login processes from private to protected.

* Made several methods virtual to allow derivative overrides.
* Minor cleanups.

5 files changed, 19 insertions, 26 deletions

diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index f92d66f..435852d4 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Framework.Communications
 
         #endregion
 
-        public XmlRpcResponse ToXmlRpcResponse()
+        public virtual XmlRpcResponse ToXmlRpcResponse()
         {
             try
             {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 26ae3c6..f4c43ef 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Communications
         /// </summary>
         /// <param name="request">The XMLRPC request</param>
         /// <returns>The response to send</returns>
-        public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
+        public virtual XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
         {
             // Temporary fix
             m_loginMutex.WaitOne();
@@ -123,8 +123,8 @@ namespace OpenSim.Framework.Communications
                 UserProfileData userProfile;
                 LoginResponse logResponse = new LoginResponse();
 
-                string firstname = String.Empty;
-                string lastname = String.Empty;
+                string firstname;
+                string lastname;
 
                 if (GoodXML)
                 {
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications
                     try
                     {
                         UUID agentID = userProfile.ID;
-                        InventoryData inventData = null;
+                        InventoryData inventData;
 
                         try
                         {
@@ -265,7 +265,7 @@ namespace OpenSim.Framework.Communications
                         logResponse.InventorySkeleton = AgentInventoryArray;
                         logResponse.InventoryLibrary = GetInventoryLibrary();
 
-                        logResponse.CircuitCode = (Int32)Util.RandomClass.Next();
+                        logResponse.CircuitCode = Util.RandomClass.Next();
                         logResponse.Lastname = userProfile.SurName;
                         logResponse.Firstname = userProfile.FirstName;
                         logResponse.AgentID = agentID.ToString();
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Communications
                     }
                     catch (Exception e)
                     {
-                        m_log.Info("[LOGIN END]:  XMLRPC Login failed, " + e.ToString());
+                        m_log.Info("[LOGIN END]:  XMLRPC Login failed, " + e);
                     }
                 }
 
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 72c9ca1..181eb92 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -104,15 +104,9 @@ namespace OpenSim.Framework.Servers
         {
             lock (m_rpcHandlers)
             {
-                if (!m_rpcHandlers.ContainsKey(method))
-                {
-                    m_rpcHandlers.Add(method, handler);
-                    return true;
-                }
+                m_rpcHandlers[method] = handler;
+                return true;
             }
-
-            //must already have a handler for that path so return false
-            return false;
         }
 
         public bool AddHTTPHandler(string method, GenericHTTPMethod handler)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index c36a238..5020558 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -31,7 +31,6 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.ClientStack.LindenUDP;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
@@ -40,8 +39,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //private static readonly log4net.ILog m_log
         //    = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        private readonly LLClientStackNetworkHandler m_networkHandler;
-        private IScene m_scene;
+        protected readonly LLClientStackNetworkHandler m_networkHandler;
+        protected IScene m_scene;
 
         //private readonly ClientManager m_clientManager = new ClientManager();
         //public ClientManager ClientManager
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 2f7fdb7..41093c1 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -41,18 +41,18 @@ namespace OpenSim.Region.Communications.Local
 
     public class LocalLoginService : LoginService
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private CommunicationsLocal m_Parent;
+        protected CommunicationsLocal m_Parent;
 
-        private NetworkServersInfo serversInfo;
-        private uint defaultHomeX;
-        private uint defaultHomeY;
-        private bool authUsers = false;
+        protected NetworkServersInfo serversInfo;
+        protected uint defaultHomeX;
+        protected uint defaultHomeY;
+        protected bool authUsers = false;
 
         public event LoginToRegionEvent OnLoginToRegion;
 
-        private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion;
+        protected LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion;
 
         public LocalLoginService(UserManagerBase userManager, string welcomeMess,
                                  CommunicationsLocal parent, NetworkServersInfo serversInfo,
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Communications.Local
         /// <param name="user"></param>
         /// <param name="response"></param>
         /// <returns>true if the region was successfully contacted, false otherwise</returns>
-        private bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response)
+        protected bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response)
         {
             response.SimAddress = regionInfo.ExternalEndPoint.Address.ToString();
             response.SimPort = (uint)regionInfo.ExternalEndPoint.Port;