aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs7
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs23
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs51
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
7 files changed, 29 insertions, 63 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 27cdd35..5bed282 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework.Communications
350 350
351 public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile) 351 public void UpdateAvatarPropertiesRequest(IClientAPI remote_client, UserProfileData UserProfile)
352 { 352 {
353 m_userService.UpdateUserProfileProperties(UserProfile); 353 m_userService.UpdateUserProfile(UserProfile);
354 return; 354 return;
355 } 355 }
356 356
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index 64c6c68..50c9917 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -88,13 +88,6 @@ namespace OpenSim.Framework.Communications
88 void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms); 88 void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
89 89
90 /// <summary> 90 /// <summary>
91 /// Updates a user profile
92 /// </summary>
93 /// <param name="UserProfile">Profile to update</param>
94 /// <returns></returns>
95 bool UpdateUserProfileProperties(UserProfileData UserProfile);
96
97 /// <summary>
98 /// Logs off a user on the user server 91 /// Logs off a user on the user server
99 /// </summary> 92 /// </summary>
100 /// <param name="UserID">UUID of the user</param> 93 /// <param name="UserID">UUID of the user</param>
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f06a438..46a9b67 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -600,29 +600,6 @@ namespace OpenSim.Framework.Communications
600 return true; 600 return true;
601 } 601 }
602 602
603 public bool UpdateUserProfileProperties(UserProfileData UserProfile)
604 {
605 if (null == GetUserProfile(UserProfile.ID))
606 {
607 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
608 return false;
609 }
610 foreach (IUserDataPlugin plugin in _plugins)
611 {
612 try
613 {
614 plugin.UpdateUserProfile(UserProfile);
615 }
616 catch (Exception e)
617 {
618 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
619 + " via " + plugin.Name + "(" + e.ToString() + ")");
620 return false;
621 }
622 }
623 return true;
624 }
625
626 public abstract UserProfileData SetupMasterUser(string firstName, string lastName); 603 public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
627 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password); 604 public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
628 public abstract UserProfileData SetupMasterUser(UUID uuid); 605 public abstract UserProfileData SetupMasterUser(UUID uuid);
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 4b5f5a0..ecb806f 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -695,7 +695,7 @@ namespace OpenSim.Grid.UserServer
695 } 695 }
696 696
697 // call plugin! 697 // call plugin!
698 bool ret = UpdateUserProfileProperties(userProfile); 698 bool ret = UpdateUserProfile(userProfile);
699 responseData["returnString"] = ret.ToString(); 699 responseData["returnString"] = ret.ToString();
700 response.Value = responseData; 700 response.Value = responseData;
701 return response; 701 return response;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 0ca85d2..28177d0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -475,38 +475,32 @@ namespace OpenSim.Region.Communications.OGS1
475 throw new Exception("The method or operation is not implemented."); 475 throw new Exception("The method or operation is not implemented.");
476 } 476 }
477 477
478 // TODO 478 public bool UpdateUserProfile(UserProfileData userProfile)
479 public bool UpdateUserProfile(UserProfileData data)
480 {
481 return false;
482 }
483
484 public bool UpdateUserProfileProperties(UserProfileData UserProfile)
485 { 479 {
486 m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile."); 480 m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile.");
487 Hashtable param = new Hashtable(); 481 Hashtable param = new Hashtable();
488 param["avatar_uuid"] = UserProfile.ID.ToString(); 482 param["avatar_uuid"] = userProfile.ID.ToString();
489 //param["AllowPublish"] = UserProfile.ToString(); 483 //param["AllowPublish"] = userProfile.ToString();
490 param["FLImageID"] = UserProfile.FirstLifeImage.ToString(); 484 param["FLImageID"] = userProfile.FirstLifeImage.ToString();
491 param["ImageID"] = UserProfile.Image.ToString(); 485 param["ImageID"] = userProfile.Image.ToString();
492 //param["MaturePublish"] = MaturePublish.ToString(); 486 //param["MaturePublish"] = MaturePublish.ToString();
493 param["AboutText"] = UserProfile.AboutText; 487 param["AboutText"] = userProfile.AboutText;
494 param["FLAboutText"] = UserProfile.FirstLifeAboutText; 488 param["FLAboutText"] = userProfile.FirstLifeAboutText;
495 //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); 489 //param["ProfileURL"] = userProfile.ProfileURL.ToString();
496 490
497 param["home_region"] = UserProfile.HomeRegion.ToString(); 491 param["home_region"] = userProfile.HomeRegion.ToString();
498 param["home_region_id"] = UserProfile.HomeRegionID.ToString(); 492 param["home_region_id"] = userProfile.HomeRegionID.ToString();
499 493
500 param["home_pos_x"] = UserProfile.HomeLocationX.ToString(); 494 param["home_pos_x"] = userProfile.HomeLocationX.ToString();
501 param["home_pos_y"] = UserProfile.HomeLocationY.ToString(); 495 param["home_pos_y"] = userProfile.HomeLocationY.ToString();
502 param["home_pos_z"] = UserProfile.HomeLocationZ.ToString(); 496 param["home_pos_z"] = userProfile.HomeLocationZ.ToString();
503 param["home_look_x"] = UserProfile.HomeLookAtX.ToString(); 497 param["home_look_x"] = userProfile.HomeLookAtX.ToString();
504 param["home_look_y"] = UserProfile.HomeLookAtY.ToString(); 498 param["home_look_y"] = userProfile.HomeLookAtY.ToString();
505 param["home_look_z"] = UserProfile.HomeLookAtZ.ToString(); 499 param["home_look_z"] = userProfile.HomeLookAtZ.ToString();
506 param["user_flags"] = UserProfile.UserFlags.ToString(); 500 param["user_flags"] = userProfile.UserFlags.ToString();
507 param["god_level"] = UserProfile.GodLevel.ToString(); 501 param["god_level"] = userProfile.GodLevel.ToString();
508 param["custom_type"] = UserProfile.CustomType.ToString(); 502 param["custom_type"] = userProfile.CustomType.ToString();
509 param["partner"] = UserProfile.Partner.ToString(); 503 param["partner"] = userProfile.Partner.ToString();
510 504
511 IList parameters = new ArrayList(); 505 IList parameters = new ArrayList();
512 parameters.Add(param); 506 parameters.Add(param);
@@ -535,6 +529,7 @@ namespace OpenSim.Region.Communications.OGS1
535 m_log.Warn("[GRID]: Unable to update user profile, UserServer didn't understand me!"); 529 m_log.Warn("[GRID]: Unable to update user profile, UserServer didn't understand me!");
536 return false; 530 return false;
537 } 531 }
532
538 return true; 533 return true;
539 } 534 }
540 535
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index f9c0dcf..b1cf802 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -134,7 +134,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
134 { 134 {
135 return; 135 return;
136 } 136 }
137 if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile)) 137
138 if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile))
138 { 139 {
139 RequestAvatarProperty(remoteClient, newProfile.ID); 140 RequestAvatarProperty(remoteClient, newProfile.ID);
140 } 141 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7116904..2a736fb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2254,7 +2254,7 @@ namespace OpenSim.Region.Environment.Scenes
2254 return; 2254 return;
2255 } 2255 }
2256 UserProfile.HomeRegionID = info.RegionID; 2256 UserProfile.HomeRegionID = info.RegionID;
2257 CommsManager.UserService.UpdateUserProfileProperties(UserProfile); 2257 CommsManager.UserService.UpdateUserProfile(UserProfile);
2258 } 2258 }
2259 else 2259 else
2260 { 2260 {
@@ -2355,7 +2355,7 @@ namespace OpenSim.Region.Environment.Scenes
2355 UserProfile.HomeRegion = RegionInfo.RegionHandle; 2355 UserProfile.HomeRegion = RegionInfo.RegionHandle;
2356 UserProfile.HomeLocation = position; 2356 UserProfile.HomeLocation = position;
2357 UserProfile.HomeLookAt = lookAt; 2357 UserProfile.HomeLookAt = lookAt;
2358 CommsManager.UserService.UpdateUserProfileProperties(UserProfile); 2358 CommsManager.UserService.UpdateUserProfile(UserProfile);
2359 2359
2360 remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false); 2360 remoteClient.SendAgentAlertMessage("Set home to here if supported by login service",false);
2361 } 2361 }