diff options
author | Teravus Ovares | 2008-03-03 09:30:59 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-03 09:30:59 +0000 |
commit | 794deeeb85a1670670a106293b695b276a69827f (patch) | |
tree | bbedaf273fbef2a6a3fc448d3d901c07506a577a /OpenSim | |
parent | Updated svn properties. (diff) | |
download | opensim-SC-794deeeb85a1670670a106293b695b276a69827f.zip opensim-SC-794deeeb85a1670670a106293b695b276a69827f.tar.gz opensim-SC-794deeeb85a1670670a106293b695b276a69827f.tar.bz2 opensim-SC-794deeeb85a1670670a106293b695b276a69827f.tar.xz |
* Fixed about Text in the profile in grid mode.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index fe12cb7..b719086 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -1589,7 +1589,10 @@ namespace OpenSim.Region.ClientStack | |||
1589 | AvatarPropertiesReplyPacket avatarReply = (AvatarPropertiesReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPropertiesReply); | 1589 | AvatarPropertiesReplyPacket avatarReply = (AvatarPropertiesReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPropertiesReply); |
1590 | avatarReply.AgentData.AgentID = AgentId; | 1590 | avatarReply.AgentData.AgentID = AgentId; |
1591 | avatarReply.AgentData.AvatarID = avatarID; | 1591 | avatarReply.AgentData.AvatarID = avatarID; |
1592 | avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText); | 1592 | if (aboutText != null) |
1593 | avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText); | ||
1594 | else | ||
1595 | avatarReply.PropertiesData.AboutText = Helpers.StringToField(""); | ||
1593 | avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn); | 1596 | avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn); |
1594 | avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember); | 1597 | avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember); |
1595 | if (flAbout != null) | 1598 | if (flAbout != null) |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 7dcbb46..c883b87 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -70,6 +70,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
70 | userData.profileFirstImage = new LLUUID((string) data["profile_firstlife_image"]); | 70 | userData.profileFirstImage = new LLUUID((string) data["profile_firstlife_image"]); |
71 | userData.profileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); | 71 | userData.profileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); |
72 | userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); | 72 | userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); |
73 | userData.profileAboutText = (string)data["profile_about"]; | ||
73 | userData.profileImage = new LLUUID((string) data["profile_image"]); | 74 | userData.profileImage = new LLUUID((string) data["profile_image"]); |
74 | userData.lastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); | 75 | userData.lastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); |
75 | userData.homeRegion = Convert.ToUInt64((string) data["home_region"]); | 76 | userData.homeRegion = Convert.ToUInt64((string) data["home_region"]); |