diff options
author | Melanie Thielker | 2009-04-14 03:44:27 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-04-14 03:44:27 +0000 |
commit | a0417f57913735a032270cb8ce89f7a3744f4da9 (patch) | |
tree | a64de699956ee69b31e4d705660a177f9e3edf12 | |
parent | Add the RegionLoaded(Scene) API to the new region module interface to allow (diff) | |
download | opensim-SC_OLD-a0417f57913735a032270cb8ce89f7a3744f4da9.zip opensim-SC_OLD-a0417f57913735a032270cb8ce89f7a3744f4da9.tar.gz opensim-SC_OLD-a0417f57913735a032270cb8ce89f7a3744f4da9.tar.bz2 opensim-SC_OLD-a0417f57913735a032270cb8ce89f7a3744f4da9.tar.xz |
Thank you, Fly-Man, for a patch that adds the stub to handle the
avatar interests update.
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
6 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 687c02a..d7afb4e 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -751,6 +751,8 @@ namespace OpenSim.Client.MXP.ClientStack | |||
751 | public event PickInfoUpdate OnPickInfoUpdate; | 751 | public event PickInfoUpdate OnPickInfoUpdate; |
752 | public event AvatarNotesUpdate OnAvatarNotesUpdate; | 752 | public event AvatarNotesUpdate OnAvatarNotesUpdate; |
753 | public event MuteListRequest OnMuteListRequest; | 753 | public event MuteListRequest OnMuteListRequest; |
754 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | ||
755 | |||
754 | #pragma warning restore 67 | 756 | #pragma warning restore 67 |
755 | 757 | ||
756 | #endregion | 758 | #endregion |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index e0983e8..064e965 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -439,6 +439,7 @@ namespace OpenSim.Framework | |||
439 | public delegate void PickInfoUpdate(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled); | 439 | public delegate void PickInfoUpdate(IClientAPI client, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled); |
440 | public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); | 440 | public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes); |
441 | public delegate void MuteListRequest(IClientAPI client, uint muteCRC); | 441 | public delegate void MuteListRequest(IClientAPI client, uint muteCRC); |
442 | public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); | ||
442 | 443 | ||
443 | #endregion | 444 | #endregion |
444 | 445 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2c8474c..7ddbfbf 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -309,6 +309,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
309 | 309 | ||
310 | private MuteListRequest handlerMuteListRequest; | 310 | private MuteListRequest handlerMuteListRequest; |
311 | 311 | ||
312 | private AvatarInterestUpdate handlerAvatarInterestUpdate; | ||
313 | |||
312 | private readonly IGroupsModule m_GroupsModule; | 314 | private readonly IGroupsModule m_GroupsModule; |
313 | 315 | ||
314 | //private TerrainUnacked handlerUnackedTerrain = null; | 316 | //private TerrainUnacked handlerUnackedTerrain = null; |
@@ -1105,6 +1107,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1105 | 1107 | ||
1106 | public event MuteListRequest OnMuteListRequest; | 1108 | public event MuteListRequest OnMuteListRequest; |
1107 | 1109 | ||
1110 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | ||
1111 | |||
1108 | public void ActivateGesture(UUID assetId, UUID gestureId) | 1112 | public void ActivateGesture(UUID assetId, UUID gestureId) |
1109 | { | 1113 | { |
1110 | } | 1114 | } |
@@ -9106,6 +9110,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9106 | avatarNotesUpdate.Data.TargetID, | 9110 | avatarNotesUpdate.Data.TargetID, |
9107 | Utils.BytesToString(avatarNotesUpdate.Data.Notes)); | 9111 | Utils.BytesToString(avatarNotesUpdate.Data.Notes)); |
9108 | break; | 9112 | break; |
9113 | |||
9114 | case PacketType.AvatarInterestsUpdate: | ||
9115 | AvatarInterestsUpdatePacket avatarInterestUpdate = | ||
9116 | (AvatarInterestsUpdatePacket)Pack; | ||
9117 | |||
9118 | break; | ||
9119 | |||
9109 | default: | 9120 | default: |
9110 | m_log.Warn("[CLIENT]: unhandled packet " + Pack); | 9121 | m_log.Warn("[CLIENT]: unhandled packet " + Pack); |
9111 | break; | 9122 | break; |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 26839f3..a6e55f4 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -266,6 +266,8 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
266 | 266 | ||
267 | public event MuteListRequest OnMuteListRequest; | 267 | public event MuteListRequest OnMuteListRequest; |
268 | 268 | ||
269 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | ||
270 | |||
269 | #pragma warning restore 67 | 271 | #pragma warning restore 67 |
270 | 272 | ||
271 | private UUID myID = UUID.Random(); | 273 | private UUID myID = UUID.Random(); |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index edd6b67..8b733cd 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -372,6 +372,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
372 | 372 | ||
373 | public event MuteListRequest OnMuteListRequest; | 373 | public event MuteListRequest OnMuteListRequest; |
374 | 374 | ||
375 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | ||
376 | |||
375 | #pragma warning restore 67 | 377 | #pragma warning restore 67 |
376 | 378 | ||
377 | #endregion | 379 | #endregion |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 4647349..0f75d70 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -279,6 +279,8 @@ namespace OpenSim.Tests.Common.Mock | |||
279 | 279 | ||
280 | public event MuteListRequest OnMuteListRequest; | 280 | public event MuteListRequest OnMuteListRequest; |
281 | 281 | ||
282 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | ||
283 | |||
282 | #pragma warning restore 67 | 284 | #pragma warning restore 67 |
283 | 285 | ||
284 | /// <value> | 286 | /// <value> |