diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 16 |
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; | |||
31 | using OpenMetaverse.Packets; | 31 | using OpenMetaverse.Packets; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
34 | using OpenSim.Region.ClientStack.LindenUDP; | ||
35 | 34 | ||
36 | namespace OpenSim.Region.ClientStack.LindenUDP | 35 | namespace OpenSim.Region.ClientStack.LindenUDP |
37 | { | 36 | { |
@@ -40,8 +39,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
40 | //private static readonly log4net.ILog m_log | 39 | //private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 40 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 41 | ||
43 | private readonly LLClientStackNetworkHandler m_networkHandler; | 42 | protected readonly LLClientStackNetworkHandler m_networkHandler; |
44 | private IScene m_scene; | 43 | protected IScene m_scene; |
45 | 44 | ||
46 | //private readonly ClientManager m_clientManager = new ClientManager(); | 45 | //private readonly ClientManager m_clientManager = new ClientManager(); |
47 | //public ClientManager ClientManager | 46 | //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 | |||
41 | 41 | ||
42 | public class LocalLoginService : LoginService | 42 | public class LocalLoginService : LoginService |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private CommunicationsLocal m_Parent; | 46 | protected CommunicationsLocal m_Parent; |
47 | 47 | ||
48 | private NetworkServersInfo serversInfo; | 48 | protected NetworkServersInfo serversInfo; |
49 | private uint defaultHomeX; | 49 | protected uint defaultHomeX; |
50 | private uint defaultHomeY; | 50 | protected uint defaultHomeY; |
51 | private bool authUsers = false; | 51 | protected bool authUsers = false; |
52 | 52 | ||
53 | public event LoginToRegionEvent OnLoginToRegion; | 53 | public event LoginToRegionEvent OnLoginToRegion; |
54 | 54 | ||
55 | private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion; | 55 | protected LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion; |
56 | 56 | ||
57 | public LocalLoginService(UserManagerBase userManager, string welcomeMess, | 57 | public LocalLoginService(UserManagerBase userManager, string welcomeMess, |
58 | CommunicationsLocal parent, NetworkServersInfo serversInfo, | 58 | CommunicationsLocal parent, NetworkServersInfo serversInfo, |
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Communications.Local | |||
246 | /// <param name="user"></param> | 246 | /// <param name="user"></param> |
247 | /// <param name="response"></param> | 247 | /// <param name="response"></param> |
248 | /// <returns>true if the region was successfully contacted, false otherwise</returns> | 248 | /// <returns>true if the region was successfully contacted, false otherwise</returns> |
249 | private bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response) | 249 | protected bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response) |
250 | { | 250 | { |
251 | response.SimAddress = regionInfo.ExternalEndPoint.Address.ToString(); | 251 | response.SimAddress = regionInfo.ExternalEndPoint.Address.ToString(); |
252 | response.SimPort = (uint)regionInfo.ExternalEndPoint.Port; | 252 | response.SimPort = (uint)regionInfo.ExternalEndPoint.Port; |