aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2010-09-14 22:03:42 +0100
committerMelanie2010-09-14 22:03:42 +0100
commit1212cb0c7442619f47f3937d0d8b7ed0ee5f6090 (patch)
tree776d0ff51f06ad2a30dbbacb7ddfd183766f0344 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentFix a small left over buglet and also add checking of the physics actor (diff)
parentFix "show threads" to show threads now being managed by OpenSim.Framework.Wat... (diff)
downloadopensim-SC_OLD-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.zip
opensim-SC_OLD-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.gz
opensim-SC_OLD-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.bz2
opensim-SC_OLD-1212cb0c7442619f47f3937d0d8b7ed0ee5f6090.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 37630e0..5b610d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1796,9 +1796,9 @@ namespace OpenSim.Region.Framework.Scenes
1796 m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); 1796 m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
1797 } 1797 }
1798 } 1798 }
1799 // m_log.DebugFormat( 1799// m_log.DebugFormat(
1800 // "[SCENE]: Storing {0}, {1} in {2}", 1800// "[SCENE]: Storing {0}, {1} in {2}",
1801 // Name, UUID, m_scene.RegionInfo.RegionName); 1801// Name, UUID, m_scene.RegionInfo.RegionName);
1802 1802
1803 SceneObjectGroup backup_group = Copy(false); 1803 SceneObjectGroup backup_group = Copy(false);
1804 backup_group.RootPart.Velocity = RootPart.Velocity; 1804 backup_group.RootPart.Velocity = RootPart.Velocity;