Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-01-03 16:52:53 -0800
committer: Dan Lake 2012-01-03 16:52:53 -0800
commit: ecf9824b63d181bd4e64bd5cb0ff37b952669bb9 (patch)
tree: 269207a773c6bd1fd8383885e0c5649d70b34a62 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parent: Access to these static methods to serialize objects are useful outside of ser... (diff)
parent: Update C5.dll to version 1.1.1 from 1.1.0 (diff)
download: opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.zip
opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.gz
opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.bz2
opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a3e4b46..1e2901b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -333,7 +333,6 @@ namespace OpenSim.Region.Framework.Scenes
            if (rot != null)
                sceneObject.UpdateGroupRotationR((Quaternion)rot);
-            //group.ApplyPhysics(m_physicalPrim);
            if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
            {
                sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);
author	Dan Lake	2012-01-03 16:52:53 -0800
committer	Dan Lake	2012-01-03 16:52:53 -0800
commit	ecf9824b63d181bd4e64bd5cb0ff37b952669bb9 (patch)
tree	269207a773c6bd1fd8383885e0c5649d70b34a62 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parent	Access to these static methods to serialize objects are useful outside of ser... (diff)
parent	Update C5.dll to version 1.1.1 from 1.1.0 (diff)
download	opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.zip opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.gz opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.bz2 opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a3e4b46..1e2901b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -333,7 +333,6 @@ namespace OpenSim.Region.Framework.Scenes
333	if (rot != null)	333	if (rot != null)
334	sceneObject.UpdateGroupRotationR((Quaternion)rot);	334	sceneObject.UpdateGroupRotationR((Quaternion)rot);
335		335
336	//group.ApplyPhysics(m_physicalPrim);
337	if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)	336	if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
338	{	337	{
339	sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);	338	sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);