diff options
| author | Melanie Thielker | 2010-08-05 18:50:17 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-05 18:50:17 +0200 |
| commit | 8bdbcda2b70ede033c38a604af573554dd2776ad (patch) | |
| tree | 7e0045b3e8c258ee23c49d6254def831bb7c3843 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Revert "Enforce a 0.2 second sleep on llDie() before the command is executed ... (diff) | |
| download | opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.zip opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.tar.gz opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.tar.bz2 opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.tar.xz | |
We already have a record of killed prims. It just wasn't used by the new
JHurlicane code anymore. Use it to prevent sending updates after kills.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 032fbe8..67cb7cc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3043,6 +3043,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3043 | UUID ownerID = _ownerID; | 3043 | UUID ownerID = _ownerID; |
| 3044 | UUID objectID = UUID; | 3044 | UUID objectID = UUID; |
| 3045 | UUID parentID = GetRootPartUUID(); | 3045 | UUID parentID = GetRootPartUUID(); |
| 3046 | |||
| 3047 | if (ParentGroup.IsAttachment && ParentGroup.RootPart.Shape.State > 30) | ||
| 3048 | { | ||
| 3049 | // Use the avatar as the parent for HUDs, since the prims | ||
| 3050 | // are not sent to other avatars | ||
| 3051 | objectID = _ownerID; | ||
| 3052 | parentID = _ownerID; | ||
| 3053 | } | ||
| 3054 | |||
| 3046 | UUID soundID = UUID.Zero; | 3055 | UUID soundID = UUID.Zero; |
| 3047 | Vector3 position = AbsolutePosition; // region local | 3056 | Vector3 position = AbsolutePosition; // region local |
| 3048 | ulong regionHandle = m_parentGroup.Scene.RegionInfo.RegionHandle; | 3057 | ulong regionHandle = m_parentGroup.Scene.RegionInfo.RegionHandle; |