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/Environment | |
parent | minor: refactor some SceneTests code for future tests (diff) | |
download | opensim-SC_OLD-47a5d71b7e7e8a354bd5640055cf4efdb881b954.zip opensim-SC_OLD-47a5d71b7e7e8a354bd5640055cf4efdb881b954.tar.gz opensim-SC_OLD-47a5d71b7e7e8a354bd5640055cf4efdb881b954.tar.bz2 opensim-SC_OLD-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/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 7b077ec..2792bf8 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -560,7 +560,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
560 | { | 560 | { |
561 | } | 561 | } |
562 | 562 | ||
563 | public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint) | 563 | public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) |
564 | { | 564 | { |
565 | } | 565 | } |
566 | 566 | ||
@@ -587,7 +587,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
587 | } | 587 | } |
588 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 588 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, |
589 | Vector3 position, Quaternion rotation, Vector3 velocity, | 589 | Vector3 position, Quaternion rotation, Vector3 velocity, |
590 | Vector3 rotationalvelocity, byte state, UUID AssetId) | 590 | Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint) |
591 | { | 591 | { |
592 | } | 592 | } |
593 | 593 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 05b23aa..c5f20da 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -3362,7 +3362,8 @@ if (m_shape != null) { | |||
3362 | (ushort)(m_parentGroup.GetTimeDilation() * | 3362 | (ushort)(m_parentGroup.GetTimeDilation() * |
3363 | (float)ushort.MaxValue), LocalId, lPos, | 3363 | (float)ushort.MaxValue), LocalId, lPos, |
3364 | RotationOffset, Velocity, | 3364 | RotationOffset, Velocity, |
3365 | RotationalVelocity, state, FromAssetID); | 3365 | RotationalVelocity, state, FromAssetID, |
3366 | OwnerID, (int)AttachmentPoint); | ||
3366 | } | 3367 | } |
3367 | } | 3368 | } |
3368 | } | 3369 | } |