diff options
Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6ff5364..17f02c2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1486,7 +1486,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1486 | avatar.StandUp(); | 1486 | avatar.StandUp(); |
| 1487 | 1487 | ||
| 1488 | if (!silent) | 1488 | if (!silent) |
| 1489 | { | ||
| 1489 | part.UpdateFlag = 0; | 1490 | part.UpdateFlag = 0; |
| 1491 | if (part == m_rootPart) | ||
| 1492 | { | ||
| 1493 | if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || | ||
| 1494 | (AttachmentPoint < 31) || (AttachmentPoint > 38)) | ||
| 1495 | avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId}); | ||
| 1496 | } | ||
| 1497 | } | ||
| 1490 | }); | 1498 | }); |
| 1491 | } | 1499 | } |
| 1492 | 1500 | ||