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

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

2 files changed, 10 insertions, 11 deletions

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;