ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plumb the user flags all the way through to the profile. userFlags in

Browse Source 
the database is now intepreted as follows: low byte = user flags.
Next byte, low nibble: Deternines the text (Resident, Lifetime, etc)
shown. No customn text support yet.
This commit is contained in:
Melanie Thielker
2008-08-15 19:19:24 +00:00
parent 63856f6330
commit 72b8c1af1c
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@@ -629,7 +629,7 @@ namespace OpenSim.Framework
void SendViewerTime(int phase);
LLUUID GetDefaultAnimation(string name);
void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout,
void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID);
void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question);

6
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -2041,7 +2041,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
*/
}
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember,
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
LLUUID partnerID)
{
@@ -2053,12 +2053,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else
avatarReply.PropertiesData.AboutText = Helpers.StringToField("");
avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn);
avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember);
avatarReply.PropertiesData.CharterMember = charterMember;
if (flAbout != null)
avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout);
else
avatarReply.PropertiesData.FLAboutText = Helpers.StringToField("");
avatarReply.PropertiesData.Flags = 0;
avatarReply.PropertiesData.Flags = flags;
avatarReply.PropertiesData.FLImageID = flImageID;
avatarReply.PropertiesData.ImageID = imageID;
avatarReply.PropertiesData.ProfileURL = Helpers.StringToField(profileURL);

7
OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
View File

@@ -97,9 +97,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
if (null != profile)
{
Byte[] charterMember = new Byte[1];
charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
Util.ToDateTime(profile.Created).ToString(),
String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
charterMember, profile.FirstLifeAboutText, (uint)(profile.UserFlags & 0xff),
profile.FirstLifeImage, profile.Image, String.Empty, partner);
}
else
@@ -130,4 +133,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
}
}
}
}
}

2
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@@ -698,7 +698,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{
}
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember,
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
LLUUID partnerID)
{

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@@ -698,7 +698,7 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember,
public void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL,
LLUUID partnerID)
{