diff options
author | Melanie Thielker | 2008-11-11 19:08:59 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-11 19:08:59 +0000 |
commit | 47a5d71b7e7e8a354bd5640055cf4efdb881b954 (patch) | |
tree | aaea097d01d36e826f9596bcb4139f445b919888 /OpenSim/Region/ClientStack | |
parent | minor: refactor some SceneTests code for future tests (diff) | |
download | opensim-SC-47a5d71b7e7e8a354bd5640055cf4efdb881b954.zip opensim-SC-47a5d71b7e7e8a354bd5640055cf4efdb881b954.tar.gz opensim-SC-47a5d71b7e7e8a354bd5640055cf4efdb881b954.tar.bz2 opensim-SC-47a5d71b7e7e8a354bd5640055cf4efdb881b954.tar.xz |
Prevent pieces from other people's HUDs from displaying at the center of
every user's HUD
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 06280ca..f25f3eb 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2332,8 +2332,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2332 | /// <param name="localID"></param> | 2332 | /// <param name="localID"></param> |
2333 | /// <param name="rotation"></param> | 2333 | /// <param name="rotation"></param> |
2334 | /// <param name="attachPoint"></param> | 2334 | /// <param name="attachPoint"></param> |
2335 | public void AttachObject(uint localID, Quaternion rotation, byte attachPoint) | 2335 | public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) |
2336 | { | 2336 | { |
2337 | if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD | ||
2338 | return; | ||
2337 | 2339 | ||
2338 | ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); | 2340 | ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); |
2339 | Console.WriteLine("Attach object!"); | 2341 | Console.WriteLine("Attach object!"); |
@@ -2458,8 +2460,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2458 | /// | 2460 | /// |
2459 | /// </summary> | 2461 | /// </summary> |
2460 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, | 2462 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, |
2461 | Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId) | 2463 | Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint) |
2462 | { | 2464 | { |
2465 | if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD | ||
2466 | return; | ||
2467 | |||
2463 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) | 2468 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) |
2464 | rotation = Quaternion.Identity; | 2469 | rotation = Quaternion.Identity; |
2465 | ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); | 2470 | ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); |