diff options
author | Melanie | 2009-10-19 21:58:51 +0100 |
---|---|---|
committer | Melanie | 2009-10-19 21:58:51 +0100 |
commit | ffd59868f5e2d797160b1bbfc13f3b4bac717b36 (patch) | |
tree | fb807a129a6e449ac17dadce15d7b27268c92c3f /OpenSim/Region/ClientStack | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.zip opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.gz opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.bz2 opensim-SC_OLD-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 4b27fa2..05a2a63 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -9969,11 +9969,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9969 | Utils.BytesToString(avatarNotesUpdate.Data.Notes)); | 9969 | Utils.BytesToString(avatarNotesUpdate.Data.Notes)); |
9970 | break; | 9970 | break; |
9971 | 9971 | ||
9972 | // case PacketType.AvatarInterestsUpdate: | 9972 | case PacketType.AvatarInterestsUpdate: |
9973 | // AvatarInterestsUpdatePacket avatarInterestUpdate = | 9973 | AvatarInterestsUpdatePacket avatarInterestUpdate = |
9974 | // (AvatarInterestsUpdatePacket)Pack; | 9974 | (AvatarInterestsUpdatePacket)Pack; |
9975 | // | 9975 | |
9976 | // break; | 9976 | #region Packet Session and User Check |
9977 | if (m_checkPackets) | ||
9978 | { | ||
9979 | if (avatarInterestUpdate.AgentData.SessionID != SessionId || | ||
9980 | avatarInterestUpdate.AgentData.AgentID != AgentId) | ||
9981 | break; | ||
9982 | } | ||
9983 | #endregion | ||
9984 | |||
9985 | AvatarInterestUpdate handlerAvatarInterestUpdate = OnAvatarInterestUpdate; | ||
9986 | if (handlerAvatarInterestUpdate != null) | ||
9987 | handlerAvatarInterestUpdate(this, | ||
9988 | avatarInterestUpdate.PropertiesData.WantToMask, | ||
9989 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.WantToText), | ||
9990 | avatarInterestUpdate.PropertiesData.SkillsMask, | ||
9991 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.SkillsText), | ||
9992 | Utils.BytesToString(avatarInterestUpdate.PropertiesData.LanguagesText)); | ||
9993 | break; | ||
9977 | 9994 | ||
9978 | case PacketType.PlacesQuery: | 9995 | case PacketType.PlacesQuery: |
9979 | PlacesQueryPacket placesQueryPacket = | 9996 | PlacesQueryPacket placesQueryPacket = |