diff options
author | mingchen | 2007-06-28 14:45:46 +0000 |
---|---|---|
committer | mingchen | 2007-06-28 14:45:46 +0000 |
commit | bee543300fc812277e9a9478dc05b986e00ed44e (patch) | |
tree | 06282ee383d09a271cc8c7bbeed5dd41b5abee8c /OpenSim/Region | |
parent | Finished removing the old scripting code, Scene.Scripting.cs and OpenSim.Fram... (diff) | |
download | opensim-SC-bee543300fc812277e9a9478dc05b986e00ed44e.zip opensim-SC-bee543300fc812277e9a9478dc05b986e00ed44e.tar.gz opensim-SC-bee543300fc812277e9a9478dc05b986e00ed44e.tar.bz2 opensim-SC-bee543300fc812277e9a9478dc05b986e00ed44e.tar.xz |
*User Profile requests on OGS UserServer now uses XMLRPC instead of REST
*Added base support for setting up a master user
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGSUserServices.cs | 17 |
2 files changed, 41 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 1eb574c..2097870 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -114,5 +114,30 @@ namespace OpenSim.Region.Communications.Local | |||
114 | 114 | ||
115 | } | 115 | } |
116 | 116 | ||
117 | public UserProfileData SetupMasterUser(string firstName, string lastName) | ||
118 | { | ||
119 | return SetupMasterUser(firstName, lastName, ""); | ||
120 | } | ||
121 | public UserProfileData SetupMasterUser(string firstName, string lastName, string password) | ||
122 | { | ||
123 | UserProfileData profile = getUserProfile(firstName, lastName); | ||
124 | if (profile != null) | ||
125 | { | ||
126 | |||
127 | return profile; | ||
128 | } | ||
129 | |||
130 | Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); | ||
131 | this.AddUserProfile(firstName, lastName, password, defaultHomeX, defaultHomeY); | ||
132 | |||
133 | profile = getUserProfile(firstName, lastName); | ||
134 | |||
135 | if (profile == null) | ||
136 | { | ||
137 | Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here."); | ||
138 | } | ||
139 | |||
140 | return profile; | ||
141 | } | ||
117 | } | 142 | } |
118 | } | 143 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs index 012774d..48d3018 100644 --- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs | |||
@@ -11,7 +11,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
11 | { | 11 | { |
12 | public UserProfileData GetUserProfile(string firstName, string lastName) | 12 | public UserProfileData GetUserProfile(string firstName, string lastName) |
13 | { | 13 | { |
14 | return null; | 14 | return GetUserProfile(firstName + " " + lastName); |
15 | } | 15 | } |
16 | public UserProfileData GetUserProfile(string name) | 16 | public UserProfileData GetUserProfile(string name) |
17 | { | 17 | { |
@@ -21,5 +21,20 @@ namespace OpenSim.Region.Communications.OGS1 | |||
21 | { | 21 | { |
22 | return null; | 22 | return null; |
23 | } | 23 | } |
24 | |||
25 | public UserProfileData SetupMasterUser(string firstName, string lastName) | ||
26 | { | ||
27 | return SetupMasterUser(firstName, lastName, ""); | ||
28 | } | ||
29 | |||
30 | public UserProfileData SetupMasterUser(string firstName, string lastName, string password) | ||
31 | { | ||
32 | UserProfileData profile = GetUserProfile(firstName, lastName); | ||
33 | if (profile == null) | ||
34 | { | ||
35 | Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented"); | ||
36 | } | ||
37 | return null; | ||
38 | } | ||
24 | } | 39 | } |
25 | } | 40 | } |