aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ad5d56f..5c0024f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -263,7 +263,7 @@ namespace OpenSim.Region.Framework.Scenes
263 if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) 263 if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
264 || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 264 || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S))
265 && !IsAttachmentCheckFull()) 265 && !IsAttachmentCheckFull())
266 { 266 {
267 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 267 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
268 } 268 }
269 269
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Framework.Scenes
454 /// <param name="scene"></param> 454 /// <param name="scene"></param>
455 public void AttachToScene(Scene scene) 455 public void AttachToScene(Scene scene)
456 { 456 {
457 m_scene = scene; 457 m_scene = scene;
458 RegionHandle = m_scene.RegionInfo.RegionHandle; 458 RegionHandle = m_scene.RegionInfo.RegionHandle;
459 459
460 if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0) 460 if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0)
@@ -479,9 +479,9 @@ namespace OpenSim.Region.Framework.Scenes
479 //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); 479 //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
480 } 480 }
481 481
482 ApplyPhysics(m_scene.m_physicalPrim); 482 ApplyPhysics(m_scene.m_physicalPrim);
483 483
484 ScheduleGroupForFullUpdate(); 484 ScheduleGroupForFullUpdate();
485 } 485 }
486 486
487 public Vector3 GroupScale() 487 public Vector3 GroupScale()
@@ -1037,12 +1037,12 @@ namespace OpenSim.Region.Framework.Scenes
1037 m_rootPart = part; 1037 m_rootPart = part;
1038 if (!IsAttachment) 1038 if (!IsAttachment)
1039 part.ParentID = 0; 1039 part.ParentID = 0;
1040 part.LinkNum = 0; 1040 part.LinkNum = 0;
1041 1041
1042 // No locking required since the SOG should not be in the scene yet - one can't change root parts after 1042 // No locking required since the SOG should not be in the scene yet - one can't change root parts after
1043 // the scene object has been attached to the scene 1043 // the scene object has been attached to the scene
1044 m_parts.Add(m_rootPart.UUID, m_rootPart); 1044 m_parts.Add(m_rootPart.UUID, m_rootPart);
1045 } 1045 }
1046 1046
1047 /// <summary> 1047 /// <summary>
1048 /// Add a new part to this scene object. The part must already be correctly configured. 1048 /// Add a new part to this scene object. The part must already be correctly configured.
@@ -1160,7 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes
1160 1160
1161 /// <summary> 1161 /// <summary>
1162 /// Delete this group from its scene and tell all the scene presences about that deletion. 1162 /// Delete this group from its scene and tell all the scene presences about that deletion.
1163 /// </summary> 1163 /// </summary>
1164 /// <param name="silent">Broadcast deletions to all clients.</param> 1164 /// <param name="silent">Broadcast deletions to all clients.</param>
1165 public void DeleteGroup(bool silent) 1165 public void DeleteGroup(bool silent)
1166 { 1166 {
@@ -1267,11 +1267,11 @@ namespace OpenSim.Region.Framework.Scenes
1267 if (part.LocalId != m_rootPart.LocalId) 1267 if (part.LocalId != m_rootPart.LocalId)
1268 { 1268 {
1269 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim); 1269 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
1270 } 1270 }
1271 } 1271 }
1272 1272
1273 // Hack to get the physics scene geometries in the right spot 1273 // Hack to get the physics scene geometries in the right spot
1274 ResetChildPrimPhysicsPositions(); 1274 ResetChildPrimPhysicsPositions();
1275 } 1275 }
1276 else 1276 else
1277 { 1277 {
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Framework.Scenes
1494 List<SceneObjectPart> partList; 1494 List<SceneObjectPart> partList;
1495 1495
1496 lock (m_parts) 1496 lock (m_parts)
1497 { 1497 {
1498 partList = new List<SceneObjectPart>(m_parts.Values); 1498 partList = new List<SceneObjectPart>(m_parts.Values);
1499 } 1499 }
1500 1500
@@ -1744,7 +1744,7 @@ namespace OpenSim.Region.Framework.Scenes
1744 rootpart.PhysActor.PIDHoverActive = false; 1744 rootpart.PhysActor.PIDHoverActive = false;
1745 } 1745 }
1746 } 1746 }
1747 } 1747 }
1748 } 1748 }
1749 1749
1750 /// <summary> 1750 /// <summary>