diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 454f031..2c1f207 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -677,7 +677,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
677 | minY = 256f; | 677 | minY = 256f; |
678 | minZ = 8192f; | 678 | minZ = 8192f; |
679 | 679 | ||
680 | lock(m_parts) | 680 | lock (m_parts) |
681 | { | 681 | { |
682 | foreach (SceneObjectPart part in m_parts.Values) | 682 | foreach (SceneObjectPart part in m_parts.Values) |
683 | { | 683 | { |
@@ -1005,7 +1005,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1005 | AbsolutePosition = detachedpos; | 1005 | AbsolutePosition = detachedpos; |
1006 | m_rootPart.AttachedAvatar = UUID.Zero; | 1006 | m_rootPart.AttachedAvatar = UUID.Zero; |
1007 | 1007 | ||
1008 | //Anakin Lohner bug #3839 | 1008 | //Anakin Lohner bug #3839 |
1009 | lock (m_parts) | 1009 | lock (m_parts) |
1010 | { | 1010 | { |
1011 | foreach (SceneObjectPart p in m_parts.Values) | 1011 | foreach (SceneObjectPart p in m_parts.Values) |
@@ -1226,7 +1226,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | /// <summary> | 1228 | /// <summary> |
1229 | /// Delete this group from its scene. | 1229 | /// Delete this group from its scene. |
1230 | /// </summary> | 1230 | /// </summary> |
1231 | /// | 1231 | /// |
1232 | /// This only handles the in-world consequences of deletion (e.g. any avatars sitting on it are forcibly stood | 1232 | /// This only handles the in-world consequences of deletion (e.g. any avatars sitting on it are forcibly stood |
@@ -1383,7 +1383,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1383 | if (!m_isBackedUp) | 1383 | if (!m_isBackedUp) |
1384 | { | 1384 | { |
1385 | // m_log.DebugFormat( | 1385 | // m_log.DebugFormat( |
1386 | // "[WATER WARS]: Ignoring backup of {0} {1} since object is not marked to be backed up", Name, UUID); | 1386 | // "[WATER WARS]: Ignoring backup of {0} {1} since object is not marked to be backed up", Name, UUID); |
1387 | return; | 1387 | return; |
1388 | } | 1388 | } |
1389 | 1389 | ||
@@ -1395,7 +1395,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1395 | } | 1395 | } |
1396 | 1396 | ||
1397 | // Since this is the top of the section of call stack for backing up a particular scene object, don't let | 1397 | // Since this is the top of the section of call stack for backing up a particular scene object, don't let |
1398 | // any exception propogate upwards. | 1398 | // any exception propogate upwards. |
1399 | try | 1399 | try |
1400 | { | 1400 | { |
1401 | if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart | 1401 | if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart |
@@ -1546,7 +1546,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1546 | newPart.LinkNum = part.LinkNum; | 1546 | newPart.LinkNum = part.LinkNum; |
1547 | } | 1547 | } |
1548 | 1548 | ||
1549 | // Need to duplicate the physics actor as well | 1549 | // Need to duplicate the physics actor as well |
1550 | if (part.PhysActor != null && userExposed) | 1550 | if (part.PhysActor != null && userExposed) |
1551 | { | 1551 | { |
1552 | PrimitiveBaseShape pbs = part.Shape; | 1552 | PrimitiveBaseShape pbs = part.Shape; |
@@ -1562,7 +1562,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1562 | 1562 | ||
1563 | part.PhysActor.LocalID = part.LocalId; | 1563 | part.PhysActor.LocalID = part.LocalId; |
1564 | part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true); | 1564 | part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true); |
1565 | } | 1565 | } |
1566 | } | 1566 | } |
1567 | 1567 | ||
1568 | if (userExposed) | 1568 | if (userExposed) |
@@ -1838,7 +1838,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1838 | SceneObjectPart newPart = null; | 1838 | SceneObjectPart newPart = null; |
1839 | 1839 | ||
1840 | lock (m_parts) | 1840 | lock (m_parts) |
1841 | { | 1841 | { |
1842 | newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); | 1842 | newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); |
1843 | newPart.SetParent(this); | 1843 | newPart.SetParent(this); |
1844 | m_parts.Add(newPart.UUID, newPart); | 1844 | m_parts.Add(newPart.UUID, newPart); |
@@ -2337,7 +2337,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2337 | if (p.LinkNum > linkPart.LinkNum) | 2337 | if (p.LinkNum > linkPart.LinkNum) |
2338 | p.LinkNum--; | 2338 | p.LinkNum--; |
2339 | } | 2339 | } |
2340 | } | 2340 | } |
2341 | } | 2341 | } |
2342 | 2342 | ||
2343 | linkPart.ParentID = 0; | 2343 | linkPart.ParentID = 0; |