OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add basic SendFindAgent() to lludp. Future use may require a list of pairs (X,Y). For now one pair is good enough.

avinationmerge
UbitUmarov 2015-10-26 21:56:02 +00:00
parent 8922d58f05
commit 6821ace3c6
5 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1392,6 +1392,8 @@ namespace OpenSim.Framework
void SendAgentOnline(UUID[] agentIDs);
void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY);
void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook);

20
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -2705,8 +2705,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(offp, ThrottleOutPacketType.Task);
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
{
FindAgentPacket fap = new FindAgentPacket();
fap.AgentBlock.Hunter = HunterID;
fap.AgentBlock.Prey = PreyID;
fap.AgentBlock.SpaceIP = 0;
fap.LocationBlock = new FindAgentPacket.LocationBlockBlock[1];
fap.LocationBlock[0] = new FindAgentPacket.LocationBlockBlock();
fap.LocationBlock[0].GlobalX = GlobalX;
fap.LocationBlock[0].GlobalY = GlobalY;
OutPacket(fap, ThrottleOutPacketType.Task);
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
{
AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket();
avatarSitResponse.SitObject.ID = TargetID;

4
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1375,6 +1375,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
{
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
{

12
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -191,9 +191,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
{
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
{
}

9
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -943,8 +943,13 @@ namespace OpenSim.Tests.Common
ReceivedOnlineNotifications.AddRange(agentIDs);
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
{
}
public void SendSitResponse(UUID TargetID, Vector3 OffsetPos,
Quaternion SitOrientation, bool autopilot,
Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
{
}