diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index d04101c..56ed959 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.UserManagement | |||
96 | try | 96 | try |
97 | { | 97 | { |
98 | UserProfileData profile = plugin.Value.GetUserByUUID(uuid); | 98 | UserProfileData profile = plugin.Value.GetUserByUUID(uuid); |
99 | profile.CurrentAgent = getUserAgent(profile.UUID); | 99 | profile.currentAgent = getUserAgent(profile.UUID); |
100 | return profile; | 100 | return profile; |
101 | } | 101 | } |
102 | catch (Exception e) | 102 | catch (Exception e) |
@@ -121,7 +121,7 @@ namespace OpenSim.Framework.UserManagement | |||
121 | try | 121 | try |
122 | { | 122 | { |
123 | UserProfileData profile = plugin.Value.GetUserByName(name); | 123 | UserProfileData profile = plugin.Value.GetUserByName(name); |
124 | profile.CurrentAgent = getUserAgent(profile.UUID); | 124 | profile.currentAgent = getUserAgent(profile.UUID); |
125 | return profile; | 125 | return profile; |
126 | } | 126 | } |
127 | catch (Exception e) | 127 | catch (Exception e) |
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.UserManagement | |||
148 | { | 148 | { |
149 | UserProfileData profile = plugin.Value.GetUserByName(fname,lname); | 149 | UserProfileData profile = plugin.Value.GetUserByName(fname,lname); |
150 | 150 | ||
151 | profile.CurrentAgent = getUserAgent(profile.UUID); | 151 | profile.currentAgent = getUserAgent(profile.UUID); |
152 | 152 | ||
153 | return profile; | 153 | return profile; |
154 | } | 154 | } |
@@ -233,7 +233,7 @@ namespace OpenSim.Framework.UserManagement | |||
233 | public void clearUserAgent(LLUUID agentID) | 233 | public void clearUserAgent(LLUUID agentID) |
234 | { | 234 | { |
235 | UserProfileData profile = GetUserProfile(agentID); | 235 | UserProfileData profile = GetUserProfile(agentID); |
236 | profile.CurrentAgent = null; | 236 | profile.currentAgent = null; |
237 | setUserProfile(profile); | 237 | setUserProfile(profile); |
238 | } | 238 | } |
239 | 239 | ||
@@ -292,8 +292,8 @@ namespace OpenSim.Framework.UserManagement | |||
292 | agent.UUID = profile.UUID; | 292 | agent.UUID = profile.UUID; |
293 | 293 | ||
294 | // Current position (from Home) | 294 | // Current position (from Home) |
295 | agent.currentHandle = profile.HomeRegion; | 295 | agent.currentHandle = profile.homeRegion; |
296 | agent.currentPos = profile.HomeLocation; | 296 | agent.currentPos = profile.homeLocation; |
297 | 297 | ||
298 | // If user specified additional start, use that | 298 | // If user specified additional start, use that |
299 | if (requestData.ContainsKey("start")) | 299 | if (requestData.ContainsKey("start")) |
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.UserManagement | |||
326 | agent.regionID = new LLUUID(); // Fill in later | 326 | agent.regionID = new LLUUID(); // Fill in later |
327 | agent.currentRegion = new LLUUID(); // Fill in later | 327 | agent.currentRegion = new LLUUID(); // Fill in later |
328 | 328 | ||
329 | profile.CurrentAgent = agent; | 329 | profile.currentAgent = agent; |
330 | } | 330 | } |
331 | 331 | ||
332 | /// <summary> | 332 | /// <summary> |
@@ -349,16 +349,16 @@ namespace OpenSim.Framework.UserManagement | |||
349 | public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) | 349 | public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) |
350 | { | 350 | { |
351 | UserProfileData user = new UserProfileData(); | 351 | UserProfileData user = new UserProfileData(); |
352 | user.HomeLocation = new LLVector3(128, 128, 100); | 352 | user.homeLocation = new LLVector3(128, 128, 100); |
353 | user.UUID = LLUUID.Random(); | 353 | user.UUID = LLUUID.Random(); |
354 | user.Firstname = firstName; | 354 | user.username = firstName; |
355 | user.Lastname = lastName; | 355 | user.surname = lastName; |
356 | user.PasswordHash = pass; | 356 | user.passwordHash = pass; |
357 | user.PasswordSalt = ""; | 357 | user.passwordSalt = ""; |
358 | user.Created = Util.UnixTimeSinceEpoch(); | 358 | user.created = Util.UnixTimeSinceEpoch(); |
359 | user.HomeLookAt = new LLVector3(100, 100, 100); | 359 | user.homeLookAt = new LLVector3(100, 100, 100); |
360 | user.HomeRegionX = regX; | 360 | user.homeRegionX = regX; |
361 | user.HomeRegionY = regY; | 361 | user.homeRegionY = regY; |
362 | 362 | ||
363 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 363 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
364 | { | 364 | { |