aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-03 08:30:36 +0000
committerTeravus Ovares2008-03-03 08:30:36 +0000
commitfe49c96ee0db0974a91b9b175ac1b00aef035797 (patch)
tree27fb1de9eea228d2e89e1c5b1c83cca8577b3bd9 /OpenSim/Region/ClientStack/ClientView.cs
parent* Doh, forgot one license header (diff)
downloadopensim-SC_OLD-fe49c96ee0db0974a91b9b175ac1b00aef035797.zip
opensim-SC_OLD-fe49c96ee0db0974a91b9b175ac1b00aef035797.tar.gz
opensim-SC_OLD-fe49c96ee0db0974a91b9b175ac1b00aef035797.tar.bz2
opensim-SC_OLD-fe49c96ee0db0974a91b9b175ac1b00aef035797.tar.xz
* Applying Ahzz's profile patch. Thanks Ahzz!
* Fixed a few bugs in the patch that are sim crashers. * There's still a bug in mySQL mode/ grid mode where the main userprofile text doesn't save.
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs27
1 files changed, 23 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index d032a2e..fe12cb7 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Region.ClientStack
123 //- used so we don't create new objects for each incoming packet and then toss it out later */ 123 //- used so we don't create new objects for each incoming packet and then toss it out later */
124 124
125 private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties; 125 private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties;
126 private UpdateAvatarProperties handlerUpdateAvatarProperties = null; // OnUpdateAvatarProperties;
126 private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer; 127 private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer;
127 private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer; 128 private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer;
128 private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage; 129 private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage;
@@ -217,7 +218,6 @@ namespace OpenSim.Region.ClientStack
217 private PacketStats handlerPacketStats = null; // OnPacketStats;# 218 private PacketStats handlerPacketStats = null; // OnPacketStats;#
218 private RequestAsset handlerRequestAsset = null; // OnRequestAsset; 219 private RequestAsset handlerRequestAsset = null; // OnRequestAsset;
219 220
220
221 /* Properties */ 221 /* Properties */
222 222
223 public LLUUID SecureSessionId 223 public LLUUID SecureSessionId
@@ -670,6 +670,7 @@ namespace OpenSim.Region.ClientStack
670 public event FetchInventory OnAgentDataUpdateRequest; 670 public event FetchInventory OnAgentDataUpdateRequest;
671 public event FetchInventory OnUserInfoRequest; 671 public event FetchInventory OnUserInfoRequest;
672 public event TeleportLocationRequest OnSetStartLocationRequest; 672 public event TeleportLocationRequest OnSetStartLocationRequest;
673 public event UpdateAvatarProperties OnUpdateAvatarProperties;
673 674
674 675
675 public event CreateNewInventoryItem OnCreateNewInventoryItem; 676 public event CreateNewInventoryItem OnCreateNewInventoryItem;
@@ -1591,7 +1592,10 @@ namespace OpenSim.Region.ClientStack
1591 avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText); 1592 avatarReply.PropertiesData.AboutText = Helpers.StringToField(aboutText);
1592 avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn); 1593 avatarReply.PropertiesData.BornOn = Helpers.StringToField(bornOn);
1593 avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember); 1594 avatarReply.PropertiesData.CharterMember = Helpers.StringToField(charterMember);
1594 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout); 1595 if (flAbout != null)
1596 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField(flAbout);
1597 else
1598 avatarReply.PropertiesData.FLAboutText = Helpers.StringToField("");
1595 avatarReply.PropertiesData.Flags = 0; 1599 avatarReply.PropertiesData.Flags = 0;
1596 avatarReply.PropertiesData.FLImageID = flImageID; 1600 avatarReply.PropertiesData.FLImageID = flImageID;
1597 avatarReply.PropertiesData.ImageID = imageID; 1601 avatarReply.PropertiesData.ImageID = imageID;
@@ -2901,10 +2905,25 @@ namespace OpenSim.Region.ClientStack
2901 if (handlerChatFromViewer != null) 2905 if (handlerChatFromViewer != null)
2902 handlerChatFromViewer(this, args); 2906 handlerChatFromViewer(this, args);
2903 } 2907 }
2908 break;
2909 case PacketType.AvatarPropertiesUpdate:
2910 AvatarPropertiesUpdatePacket Packet = (AvatarPropertiesUpdatePacket)Pack;
2904 2911
2905 2912 handlerUpdateAvatarProperties = OnUpdateAvatarProperties;
2906 2913 if (handlerUpdateAvatarProperties != null)
2914 {
2915 AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = Packet.PropertiesData;
2916 UserProfileData UserProfile = new UserProfileData();
2917 UserProfile.UUID = AgentId;
2918 UserProfile.profileAboutText = Util.FieldToString(Properties.AboutText);
2919 UserProfile.profileFirstText = Util.FieldToString(Properties.FLAboutText);
2920 UserProfile.profileFirstImage = Properties.FLImageID;
2921 UserProfile.profileImage = Properties.ImageID;
2922
2923 handlerUpdateAvatarProperties(this, UserProfile);
2924 }
2907 break; 2925 break;
2926
2908 case PacketType.ScriptDialogReply: 2927 case PacketType.ScriptDialogReply:
2909 ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; 2928 ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack;
2910 int ch = rdialog.Data.ChatChannel; 2929 int ch = rdialog.Data.ChatChannel;