From 79045abe685efef2c497b6cae97601689186153f Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 24 Sep 2007 01:16:21 +0000 Subject: * Renamed stuff on UserManagerBase to get implicit implementation of IUserServices (instead of stubs) --- .../Communications/Local/LocalUserServices.cs | 28 ++++++---------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'OpenSim/Region/Communications/Local/LocalUserServices.cs') diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 1a409bf..02b6e60 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -10,36 +10,22 @@ namespace OpenSim.Region.Communications.Local { public class LocalUserServices : UserManagerBase, IUserServices { - private CommunicationsLocal m_Parent; + private readonly CommunicationsLocal m_Parent; - private NetworkServersInfo serversInfo; - private uint defaultHomeX ; - private uint defaultHomeY; + private readonly NetworkServersInfo serversInfo; + private readonly uint defaultHomeX ; + private readonly uint defaultHomeY; public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo) { m_Parent = parent; this.serversInfo = serversInfo; + defaultHomeX = this.serversInfo.DefaultHomeLocX; defaultHomeY = this.serversInfo.DefaultHomeLocY; } - public UserProfileData GetUserProfile(string firstName, string lastName) - { - return GetUserProfile(firstName + " " + lastName); - } - - public UserProfileData GetUserProfile(string name) - { - return this.getUserProfile(name); - } - - public UserProfileData GetUserProfile(LLUUID avatarID) - { - return this.getUserProfile(avatarID); - } - public UserProfileData SetupMasterUser(string firstName, string lastName) { return SetupMasterUser(firstName, lastName, ""); @@ -47,7 +33,7 @@ namespace OpenSim.Region.Communications.Local public UserProfileData SetupMasterUser(string firstName, string lastName, string password) { - UserProfileData profile = getUserProfile(firstName, lastName); + UserProfileData profile = base.GetUserProfile(firstName, lastName); if (profile != null) { @@ -57,7 +43,7 @@ namespace OpenSim.Region.Communications.Local Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY); - profile = getUserProfile(firstName, lastName); + profile = base.GetUserProfile(firstName, lastName); if (profile == null) { -- cgit v1.1