From 32e30afbcba5463ecf9aa50291b16d7d02c8170b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 27 Jul 2016 21:31:43 +0100
Subject:  actually that was redundante, already done at low level

---
 .../CoreModules/Avatar/Attachments/AttachmentsModule.cs   |  2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs       | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 786258f..8f03a0a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -741,7 +741,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
                 
-                so.ApplyPhysics(false);
+                so.ApplyPhysics();
 
                 rootPart.Rezzed = DateTime.Now;
                 so.AttachToBackup();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index d399535..efc1413 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1237,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //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);
             }
 
-            ApplyPhysics(true);
+            ApplyPhysics();
 
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
             // for the same object with very different properties.  The caller must schedule the update.
@@ -1846,7 +1846,7 @@ namespace OpenSim.Region.Framework.Scenes
             AttachmentPoint = (byte)0;
             // must check if buildind should be true or false here
 //            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false);
-            ApplyPhysics(false);
+            ApplyPhysics();
 
             HasGroupChanged = true;
             RootPart.Rezzed = DateTime.Now;
@@ -2151,7 +2151,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Apply physics to this group
         /// </summary>
-        public void ApplyPhysics(bool refreshForces)
+        public void ApplyPhysics()
         {
             SceneObjectPart[] parts = m_parts.GetArray();
             if (parts.Length > 1)
@@ -2179,13 +2179,6 @@ namespace OpenSim.Region.Framework.Scenes
                 // Apply physics to the root prim
                 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false);
             }
-
-            if (m_rootPart.PhysActor != null && refreshForces)
-            {
-                m_rootPart.Force = m_rootPart.Force;
-                m_rootPart.Torque = m_rootPart.Torque;
-                m_rootPart.Buoyancy = m_rootPart.Buoyancy;                
-            }
         }
 
         public void SetOwnerId(UUID userId)
@@ -3079,7 +3072,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     // cancel physics
                     RootPart.Flags &= ~PrimFlags.Physics;
-                    ApplyPhysics(false);
+                    ApplyPhysics();
                 }
             }
 
-- 
cgit v1.1