aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/UserManagerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 02be6bd..91c284c 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.UserManagement
96 96
97 if (profile != null) 97 if (profile != null)
98 { 98 {
99 profile.CurrentAgent = getUserAgent(profile.Id); 99 profile.CurrentAgent = getUserAgent(profile.ID);
100 return profile; 100 return profile;
101 } 101 }
102 } 102 }
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.UserManagement
113 113
114 if (null != profile) 114 if (null != profile)
115 { 115 {
116 profile.CurrentAgent = getUserAgent(profile.Id); 116 profile.CurrentAgent = getUserAgent(profile.ID);
117 return profile; 117 return profile;
118 } 118 }
119 } 119 }
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.UserManagement
355 agent.sessionID = new LLUUID(randDataS, 0); 355 agent.sessionID = new LLUUID(randDataS, 0);
356 356
357 // Profile UUID 357 // Profile UUID
358 agent.UUID = profile.Id; 358 agent.UUID = profile.ID;
359 359
360 // Current position (from Home) 360 // Current position (from Home)
361 agent.currentHandle = profile.HomeRegion; 361 agent.currentHandle = profile.HomeRegion;
@@ -481,7 +481,7 @@ namespace OpenSim.Framework.UserManagement
481 agent.sessionID = new LLUUID(randDataS, 0); 481 agent.sessionID = new LLUUID(randDataS, 0);
482 482
483 // Profile UUID 483 // Profile UUID
484 agent.UUID = profile.Id; 484 agent.UUID = profile.ID;
485 485
486 // Current position (from Home) 486 // Current position (from Home)
487 agent.currentHandle = profile.HomeRegion; 487 agent.currentHandle = profile.HomeRegion;
@@ -523,7 +523,7 @@ namespace OpenSim.Framework.UserManagement
523 { 523 {
524 UserProfileData user = new UserProfileData(); 524 UserProfileData user = new UserProfileData();
525 user.HomeLocation = new LLVector3(128, 128, 100); 525 user.HomeLocation = new LLVector3(128, 128, 100);
526 user.Id = LLUUID.Random(); 526 user.ID = LLUUID.Random();
527 user.FirstName = firstName; 527 user.FirstName = firstName;
528 user.SurName = lastName; 528 user.SurName = lastName;
529 user.PasswordHash = pass; 529 user.PasswordHash = pass;
@@ -545,14 +545,14 @@ namespace OpenSim.Framework.UserManagement
545 } 545 }
546 } 546 }
547 547
548 return user.Id; 548 return user.ID;
549 } 549 }
550 550
551 public bool UpdateUserProfileProperties(UserProfileData UserProfile) 551 public bool UpdateUserProfileProperties(UserProfileData UserProfile)
552 { 552 {
553 if (null == GetUserProfile(UserProfile.Id)) 553 if (null == GetUserProfile(UserProfile.ID))
554 { 554 {
555 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.Id.ToString()); 555 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
556 return false; 556 return false;
557 } 557 }
558 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 558 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@@ -563,7 +563,7 @@ namespace OpenSim.Framework.UserManagement
563 } 563 }
564 catch (Exception e) 564 catch (Exception e)
565 { 565 {
566 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.Id.ToString() 566 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
567 + " via " + plugin.Key + "(" + e.ToString() + ")"); 567 + " via " + plugin.Key + "(" + e.ToString() + ")");
568 return false; 568 return false;
569 } 569 }