diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index a94e592..6579860 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
225 | { | 225 | { |
226 | Vector3 val = value; | 226 | Vector3 val = value; |
227 | 227 | ||
228 | if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !m_rootPart.IsAttachment) | 228 | if ((val.X > 257f || val.X < -1f || val.Y > 257f || val.Y < -1f) && !IsAttachment) |
229 | { | 229 | { |
230 | m_scene.CrossPrimGroupIntoNewRegion(val, this); | 230 | m_scene.CrossPrimGroupIntoNewRegion(val, this); |
231 | } | 231 | } |
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1212 | if (HasGroupChanged) | 1212 | if (HasGroupChanged) |
1213 | { | 1213 | { |
1214 | // don't backup while it's selected or you're asking for changes mid stream. | 1214 | // don't backup while it's selected or you're asking for changes mid stream. |
1215 | if ((!IsSelected) && (RootPart != null) && (!m_rootPart.IsAttachment)) | 1215 | if (!(IsSelected || IsDeleted || IsAttachment)) |
1216 | { | 1216 | { |
1217 | m_log.DebugFormat( | 1217 | m_log.DebugFormat( |
1218 | "[SCENE]: Storing {0}, {1} in {2}", | 1218 | "[SCENE]: Storing {0}, {1} in {2}", |
@@ -1271,7 +1271,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1271 | { | 1271 | { |
1272 | if (m_rootPart != null && m_rootPart.UUID == part.UUID) | 1272 | if (m_rootPart != null && m_rootPart.UUID == part.UUID) |
1273 | { | 1273 | { |
1274 | if (m_rootPart.IsAttachment) | 1274 | if (IsAttachment) |
1275 | { | 1275 | { |
1276 | part.SendFullUpdateToClient(remoteClient, m_rootPart.AttachedPos, clientFlags); | 1276 | part.SendFullUpdateToClient(remoteClient, m_rootPart.AttachedPos, clientFlags); |
1277 | } | 1277 | } |
@@ -1441,7 +1441,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1441 | { | 1441 | { |
1442 | if (rootpart.PhysActor != null) | 1442 | if (rootpart.PhysActor != null) |
1443 | { | 1443 | { |
1444 | if (rootpart.IsAttachment) | 1444 | if (IsAttachment) |
1445 | { | 1445 | { |
1446 | ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar); | 1446 | ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar); |
1447 | if (avatar != null) | 1447 | if (avatar != null) |
@@ -1580,7 +1580,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1580 | 1580 | ||
1581 | lock (m_parts) | 1581 | lock (m_parts) |
1582 | { | 1582 | { |
1583 | //if (m_rootPart.m_IsAttachment) | 1583 | //if (IsAttachment) |
1584 | //{ | 1584 | //{ |
1585 | //foreach (SceneObjectPart part in m_parts.Values) | 1585 | //foreach (SceneObjectPart part in m_parts.Values) |
1586 | //{ | 1586 | //{ |
@@ -2437,7 +2437,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2437 | { | 2437 | { |
2438 | if (m_scene.EventManager.TriggerGroupMove(UUID, pos)) | 2438 | if (m_scene.EventManager.TriggerGroupMove(UUID, pos)) |
2439 | { | 2439 | { |
2440 | if (m_rootPart.IsAttachment) | 2440 | if (IsAttachment) |
2441 | { | 2441 | { |
2442 | m_rootPart.AttachedPos = pos; | 2442 | m_rootPart.AttachedPos = pos; |
2443 | } | 2443 | } |