mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 17:55:48 +08:00
* Converted a number of methods within the login processes from private to protected.
* Made several methods virtual to allow derivative overrides. * Minor cleanups.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user