ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved fields to properties for UserDataProfile, which was

Browse Source 
actually a little more work than I expected given the copious
use of out params.
This commit is contained in:
Sean Dague
2008-04-10 13:53:06 +00:00
parent 1178eddffc
commit c176caeb05
24 changed files with 591 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
View File

@@ -90,10 +90,10 @@ namespace OpenSim.Region.Environment.Modules
UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
if (null != profile)
{
remoteClient.SendAvatarProperties(profile.UUID, profile.profileAboutText,
Util.ToDateTime(profile.created).ToString(),
System.String.Empty, profile.profileFirstText, profile.profileCanDoMask,
profile.profileFirstImage, profile.profileImage, System.String.Empty, partner);
remoteClient.SendAvatarProperties(profile.Id, profile.ProfileAboutText,
Util.ToDateTime(profile.Created).ToString(),
System.String.Empty, profile.ProfileFirstText, profile.ProfileCanDoMask,
profile.ProfileFirstImage, profile.ProfileImage, System.String.Empty, partner);
}
else
{
@@ -103,15 +103,15 @@ namespace OpenSim.Region.Environment.Modules
public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
{
UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.UUID);
UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.Id);
// if it's the profile of the user requesting the update, then we change only a few things.
if (remoteClient.AgentId.CompareTo(Profile.UUID) == 0)
if (remoteClient.AgentId.CompareTo(Profile.Id) == 0)
{
Profile.profileImage = newProfile.profileImage;
Profile.profileFirstImage = newProfile.profileFirstImage;
Profile.profileAboutText = newProfile.profileAboutText;
Profile.profileFirstText = newProfile.profileFirstText;
Profile.ProfileImage = newProfile.ProfileImage;
Profile.ProfileFirstImage = newProfile.ProfileFirstImage;
Profile.ProfileAboutText = newProfile.ProfileAboutText;
Profile.ProfileFirstText = newProfile.ProfileFirstText;
}
else
{
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Modules
}
if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
{
RequestAvatarProperty(remoteClient, newProfile.UUID);
RequestAvatarProperty(remoteClient, newProfile.Id);
}
}
}

2
OpenSim/Region/Environment/Modules/VoiceModule.cs
View File

@@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Modules
if (null == userInfo) throw new Exception("cannot get user details");
LLSDVoiceAccountResponse voiceAccountResponse =
new LLSDVoiceAccountResponse(voiceUser, "$1$" + userInfo.UserProfile.passwordHash);
new LLSDVoiceAccountResponse(voiceUser, "$1$" + userInfo.UserProfile.PasswordHash);
string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
m_log.DebugFormat("[CAPS][PROVISIONVOICE]: {0}", r);
return r;