diff options
author | lbsa71 | 2007-09-24 01:31:00 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-24 01:31:00 +0000 |
commit | 47256cebda8f6519ab09fe66b64deb28f0702042 (patch) | |
tree | 8a1d43d087f5d69a981179cbad018d3bc74b6eb3 /OpenSim/Region/Communications/Local/LocalUserServices.cs | |
parent | * minor renames (diff) | |
download | opensim-SC-47256cebda8f6519ab09fe66b64deb28f0702042.zip opensim-SC-47256cebda8f6519ab09fe66b64deb28f0702042.tar.gz opensim-SC-47256cebda8f6519ab09fe66b64deb28f0702042.tar.bz2 opensim-SC-47256cebda8f6519ab09fe66b64deb28f0702042.tar.xz |
* Renamed methods on IUserData
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 612f654..a7cefcb 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -1,10 +1,8 @@ | |||
1 | using System; | 1 | using System; |
2 | using libsecondlife; | ||
3 | using OpenSim.Framework.Communications; | 2 | using OpenSim.Framework.Communications; |
4 | using OpenSim.Framework.Data; | 3 | using OpenSim.Framework.Data; |
5 | using OpenSim.Framework.Types; | 4 | using OpenSim.Framework.Types; |
6 | using OpenSim.Framework.UserManagement; | 5 | using OpenSim.Framework.UserManagement; |
7 | using OpenSim.Framework.Utilities; | ||
8 | 6 | ||
9 | namespace OpenSim.Region.Communications.Local | 7 | namespace OpenSim.Region.Communications.Local |
10 | { | 8 | { |
@@ -13,7 +11,7 @@ namespace OpenSim.Region.Communications.Local | |||
13 | private readonly CommunicationsLocal m_parent; | 11 | private readonly CommunicationsLocal m_parent; |
14 | 12 | ||
15 | private readonly NetworkServersInfo m_serversInfo; | 13 | private readonly NetworkServersInfo m_serversInfo; |
16 | private readonly uint m_defaultHomeX ; | 14 | private readonly uint m_defaultHomeX; |
17 | private readonly uint m_defaultHomeY; | 15 | private readonly uint m_defaultHomeY; |
18 | 16 | ||
19 | 17 | ||
@@ -22,8 +20,8 @@ namespace OpenSim.Region.Communications.Local | |||
22 | m_parent = parent; | 20 | m_parent = parent; |
23 | m_serversInfo = serversInfo; | 21 | m_serversInfo = serversInfo; |
24 | 22 | ||
25 | m_defaultHomeX = this.m_serversInfo.DefaultHomeLocX; | 23 | m_defaultHomeX = m_serversInfo.DefaultHomeLocX; |
26 | m_defaultHomeY = this.m_serversInfo.DefaultHomeLocY; | 24 | m_defaultHomeY = m_serversInfo.DefaultHomeLocY; |
27 | } | 25 | } |
28 | 26 | ||
29 | public UserProfileData SetupMasterUser(string firstName, string lastName) | 27 | public UserProfileData SetupMasterUser(string firstName, string lastName) |
@@ -33,17 +31,16 @@ namespace OpenSim.Region.Communications.Local | |||
33 | 31 | ||
34 | public UserProfileData SetupMasterUser(string firstName, string lastName, string password) | 32 | public UserProfileData SetupMasterUser(string firstName, string lastName, string password) |
35 | { | 33 | { |
36 | UserProfileData profile = base.GetUserProfile(firstName, lastName); | 34 | UserProfileData profile = GetUserProfile(firstName, lastName); |
37 | if (profile != null) | 35 | if (profile != null) |
38 | { | 36 | { |
39 | |||
40 | return profile; | 37 | return profile; |
41 | } | 38 | } |
42 | 39 | ||
43 | Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); | 40 | Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); |
44 | this.AddUserProfile(firstName, lastName, password, m_defaultHomeX, m_defaultHomeY); | 41 | AddUserProfile(firstName, lastName, password, m_defaultHomeX, m_defaultHomeY); |
45 | 42 | ||
46 | profile = base.GetUserProfile(firstName, lastName); | 43 | profile = GetUserProfile(firstName, lastName); |
47 | 44 | ||
48 | if (profile == null) | 45 | if (profile == null) |
49 | { | 46 | { |
@@ -51,10 +48,10 @@ namespace OpenSim.Region.Communications.Local | |||
51 | } | 48 | } |
52 | else | 49 | else |
53 | { | 50 | { |
54 | m_parent.InvenServices.CreateNewUserInventory(profile.UUID); | 51 | m_parent.InvenServices.CreateNewUserInventory(profile.UUID); |
55 | } | 52 | } |
56 | 53 | ||
57 | return profile; | 54 | return profile; |
58 | } | 55 | } |
59 | } | 56 | } |
60 | } | 57 | } \ No newline at end of file |