aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/LocalUserServices.cs
diff options
context:
space:
mode:
authorlbsa712007-09-24 01:16:21 +0000
committerlbsa712007-09-24 01:16:21 +0000
commit79045abe685efef2c497b6cae97601689186153f (patch)
tree9917bba55dcd738ee7dc7bce6dd07dfab577c43e /OpenSim/Region/Communications/Local/LocalUserServices.cs
parent* Purged 'Regions' code pending Agent layer grok. (diff)
downloadopensim-SC-79045abe685efef2c497b6cae97601689186153f.zip
opensim-SC-79045abe685efef2c497b6cae97601689186153f.tar.gz
opensim-SC-79045abe685efef2c497b6cae97601689186153f.tar.bz2
opensim-SC-79045abe685efef2c497b6cae97601689186153f.tar.xz
* Renamed stuff on UserManagerBase to get implicit implementation of IUserServices (instead of stubs)
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalUserServices.cs')
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs28
1 files changed, 7 insertions, 21 deletions
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
10{ 10{
11 public class LocalUserServices : UserManagerBase, IUserServices 11 public class LocalUserServices : UserManagerBase, IUserServices
12 { 12 {
13 private CommunicationsLocal m_Parent; 13 private readonly CommunicationsLocal m_Parent;
14 14
15 private NetworkServersInfo serversInfo; 15 private readonly NetworkServersInfo serversInfo;
16 private uint defaultHomeX ; 16 private readonly uint defaultHomeX ;
17 private uint defaultHomeY; 17 private readonly uint defaultHomeY;
18 18
19 19
20 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo) 20 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo)
21 { 21 {
22 m_Parent = parent; 22 m_Parent = parent;
23 this.serversInfo = serversInfo; 23 this.serversInfo = serversInfo;
24
24 defaultHomeX = this.serversInfo.DefaultHomeLocX; 25 defaultHomeX = this.serversInfo.DefaultHomeLocX;
25 defaultHomeY = this.serversInfo.DefaultHomeLocY; 26 defaultHomeY = this.serversInfo.DefaultHomeLocY;
26 } 27 }
27 28
28 public UserProfileData GetUserProfile(string firstName, string lastName)
29 {
30 return GetUserProfile(firstName + " " + lastName);
31 }
32
33 public UserProfileData GetUserProfile(string name)
34 {
35 return this.getUserProfile(name);
36 }
37
38 public UserProfileData GetUserProfile(LLUUID avatarID)
39 {
40 return this.getUserProfile(avatarID);
41 }
42
43 public UserProfileData SetupMasterUser(string firstName, string lastName) 29 public UserProfileData SetupMasterUser(string firstName, string lastName)
44 { 30 {
45 return SetupMasterUser(firstName, lastName, ""); 31 return SetupMasterUser(firstName, lastName, "");
@@ -47,7 +33,7 @@ namespace OpenSim.Region.Communications.Local
47 33
48 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 34 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
49 { 35 {
50 UserProfileData profile = getUserProfile(firstName, lastName); 36 UserProfileData profile = base.GetUserProfile(firstName, lastName);
51 if (profile != null) 37 if (profile != null)
52 { 38 {
53 39
@@ -57,7 +43,7 @@ namespace OpenSim.Region.Communications.Local
57 Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); 43 Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account");
58 this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY); 44 this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY);
59 45
60 profile = getUserProfile(firstName, lastName); 46 profile = base.GetUserProfile(firstName, lastName);
61 47
62 if (profile == null) 48 if (profile == null)
63 { 49 {