aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorSean Dague2009-02-09 20:06:06 +0000
committerSean Dague2009-02-09 20:06:06 +0000
commit66dc421be7974c6aafb12f318a7649dca99f0989 (patch)
tree5415c8ef9ad05f38d1f4d0673be39e29d9e5ac44 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentadd a script for fixing line endings (at least from linux) (diff)
downloadopensim-SC_OLD-66dc421be7974c6aafb12f318a7649dca99f0989.zip
opensim-SC_OLD-66dc421be7974c6aafb12f318a7649dca99f0989.tar.gz
opensim-SC_OLD-66dc421be7974c6aafb12f318a7649dca99f0989.tar.bz2
opensim-SC_OLD-66dc421be7974c6aafb12f318a7649dca99f0989.tar.xz
a last set of files that seem to have embedded ^M in them
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ba2b55e..d3b9626 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1023,7 +1023,7 @@ namespace OpenSim.Region.Framework.Scenes
1023 // at region startup 1023 // at region startup
1024 1024
1025 // teravus: After this was removed from the linking algorithm, Linked prims no longer collided 1025 // teravus: After this was removed from the linking algorithm, Linked prims no longer collided
1026 // properly when non-physical if they havn't been moved. This breaks ALL builds. 1026 // properly when non-physical if they havn't been moved. This breaks ALL builds.
1027 // see: http://opensimulator.org/mantis/view.php?id=3108 1027 // see: http://opensimulator.org/mantis/view.php?id=3108
1028 1028
1029 // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the 1029 // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the
@@ -2074,12 +2074,12 @@ namespace OpenSim.Region.Framework.Scenes
2074 // Can't do this yet since backup still makes use of the root part without any synchronization 2074 // Can't do this yet since backup still makes use of the root part without any synchronization
2075// objectGroup.m_rootPart = null; 2075// objectGroup.m_rootPart = null;
2076 2076
2077 AttachToBackup(); 2077 AttachToBackup();
2078 2078
2079 2079
2080 // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the 2080 // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the
2081 // position of linkset prims. IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and 2081 // position of linkset prims. IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and
2082 // unmoved prims! 2082 // unmoved prims!
2083 ResetChildPrimPhysicsPositions(); 2083 ResetChildPrimPhysicsPositions();
2084 2084
2085 HasGroupChanged = true; 2085 HasGroupChanged = true;