diff options
| author | Justin Clark-Casey (justincc) | 2012-06-20 23:25:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-20 23:25:07 +0100 |
| commit | 68ea096f1b1276e09510633d48313d6e870d0d97 (patch) | |
| tree | 23b4b56ddcf936a2e1d35747eaedf5651f9b2df5 | |
| parent | refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ... (diff) | |
| download | opensim-SC-68ea096f1b1276e09510633d48313d6e870d0d97.zip opensim-SC-68ea096f1b1276e09510633d48313d6e870d0d97.tar.gz opensim-SC-68ea096f1b1276e09510633d48313d6e870d0d97.tar.bz2 opensim-SC-68ea096f1b1276e09510633d48313d6e870d0d97.tar.xz | |
Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instead of magic numbers
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 619296e..18877c1e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -1205,8 +1205,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1205 | part.ClearUpdateSchedule(); | 1205 | part.ClearUpdateSchedule(); |
| 1206 | if (part == m_rootPart) | 1206 | if (part == m_rootPart) |
| 1207 | { | 1207 | { |
| 1208 | if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || | 1208 | if (!IsAttachment |
| 1209 | (AttachmentPoint < 31) || (AttachmentPoint > 38)) | 1209 | || AttachedAvatar == avatar.ControllingClient.AgentId |
| 1210 | || !HasPrivateAttachmentPoint) | ||
| 1210 | avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId }); | 1211 | avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId }); |
| 1211 | } | 1212 | } |
| 1212 | } | 1213 | } |