diff options
5 files changed, 40 insertions, 7 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index a76c89e..85edce3 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1392,6 +1392,8 @@ namespace OpenSim.Framework | |||
1392 | 1392 | ||
1393 | void SendAgentOnline(UUID[] agentIDs); | 1393 | void SendAgentOnline(UUID[] agentIDs); |
1394 | 1394 | ||
1395 | void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY); | ||
1396 | |||
1395 | void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, | 1397 | void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, |
1396 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook); | 1398 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook); |
1397 | 1399 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 6667c35..51c59e9 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -2705,8 +2705,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2705 | OutPacket(offp, ThrottleOutPacketType.Task); | 2705 | OutPacket(offp, ThrottleOutPacketType.Task); |
2706 | } | 2706 | } |
2707 | 2707 | ||
2708 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, | 2708 | public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY) |
2709 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | 2709 | { |
2710 | FindAgentPacket fap = new FindAgentPacket(); | ||
2711 | fap.AgentBlock.Hunter = HunterID; | ||
2712 | fap.AgentBlock.Prey = PreyID; | ||
2713 | fap.AgentBlock.SpaceIP = 0; | ||
2714 | |||
2715 | fap.LocationBlock = new FindAgentPacket.LocationBlockBlock[1]; | ||
2716 | fap.LocationBlock[0] = new FindAgentPacket.LocationBlockBlock(); | ||
2717 | fap.LocationBlock[0].GlobalX = GlobalX; | ||
2718 | fap.LocationBlock[0].GlobalY = GlobalY; | ||
2719 | |||
2720 | OutPacket(fap, ThrottleOutPacketType.Task); | ||
2721 | } | ||
2722 | |||
2723 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, | ||
2724 | Quaternion SitOrientation, bool autopilot, | ||
2725 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | ||
2710 | { | 2726 | { |
2711 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); | 2727 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); |
2712 | avatarSitResponse.SitObject.ID = TargetID; | 2728 | avatarSitResponse.SitObject.ID = TargetID; |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 6a96d4d..6611744 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1375,6 +1375,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1375 | 1375 | ||
1376 | } | 1376 | } |
1377 | 1377 | ||
1378 | public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY) | ||
1379 | { | ||
1380 | } | ||
1381 | |||
1378 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | 1382 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) |
1379 | { | 1383 | { |
1380 | 1384 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 15e3884..7228348 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -191,9 +191,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
191 | { | 191 | { |
192 | 192 | ||
193 | } | 193 | } |
194 | 194 | ||
195 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, | 195 | public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY) |
196 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | 196 | { |
197 | |||
198 | } | ||
199 | |||
200 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, | ||
201 | Quaternion SitOrientation, bool autopilot, | ||
202 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | ||
197 | { | 203 | { |
198 | 204 | ||
199 | } | 205 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 76ee5c2..ff7ba00 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -943,8 +943,13 @@ namespace OpenSim.Tests.Common | |||
943 | ReceivedOnlineNotifications.AddRange(agentIDs); | 943 | ReceivedOnlineNotifications.AddRange(agentIDs); |
944 | } | 944 | } |
945 | 945 | ||
946 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, | 946 | public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY) |
947 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | 947 | { |
948 | } | ||
949 | |||
950 | public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, | ||
951 | Quaternion SitOrientation, bool autopilot, | ||
952 | Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) | ||
948 | { | 953 | { |
949 | } | 954 | } |
950 | 955 | ||