diff options
author | UbitUmarov | 2016-07-27 21:31:43 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-27 21:31:43 +0100 |
commit | 32e30afbcba5463ecf9aa50291b16d7d02c8170b (patch) | |
tree | 3891f624e2825eba080585844bcb1400917fedf8 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | move refresh forces into applyphysics (diff) | |
download | opensim-SC_OLD-32e30afbcba5463ecf9aa50291b16d7d02c8170b.zip opensim-SC_OLD-32e30afbcba5463ecf9aa50291b16d7d02c8170b.tar.gz opensim-SC_OLD-32e30afbcba5463ecf9aa50291b16d7d02c8170b.tar.bz2 opensim-SC_OLD-32e30afbcba5463ecf9aa50291b16d7d02c8170b.tar.xz |
actually that was redundante, already done at low level
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 15 |
1 files changed, 4 insertions, 11 deletions
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 | |||
1237 | //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); | 1237 | //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); |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | ApplyPhysics(true); | 1240 | ApplyPhysics(); |
1241 | 1241 | ||
1242 | // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled | 1242 | // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled |
1243 | // for the same object with very different properties. The caller must schedule the update. | 1243 | // for the same object with very different properties. The caller must schedule the update. |
@@ -1846,7 +1846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1846 | AttachmentPoint = (byte)0; | 1846 | AttachmentPoint = (byte)0; |
1847 | // must check if buildind should be true or false here | 1847 | // must check if buildind should be true or false here |
1848 | // m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false); | 1848 | // m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false); |
1849 | ApplyPhysics(false); | 1849 | ApplyPhysics(); |
1850 | 1850 | ||
1851 | HasGroupChanged = true; | 1851 | HasGroupChanged = true; |
1852 | RootPart.Rezzed = DateTime.Now; | 1852 | RootPart.Rezzed = DateTime.Now; |
@@ -2151,7 +2151,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2151 | /// <summary> | 2151 | /// <summary> |
2152 | /// Apply physics to this group | 2152 | /// Apply physics to this group |
2153 | /// </summary> | 2153 | /// </summary> |
2154 | public void ApplyPhysics(bool refreshForces) | 2154 | public void ApplyPhysics() |
2155 | { | 2155 | { |
2156 | SceneObjectPart[] parts = m_parts.GetArray(); | 2156 | SceneObjectPart[] parts = m_parts.GetArray(); |
2157 | if (parts.Length > 1) | 2157 | if (parts.Length > 1) |
@@ -2179,13 +2179,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2179 | // Apply physics to the root prim | 2179 | // Apply physics to the root prim |
2180 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false); | 2180 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false); |
2181 | } | 2181 | } |
2182 | |||
2183 | if (m_rootPart.PhysActor != null && refreshForces) | ||
2184 | { | ||
2185 | m_rootPart.Force = m_rootPart.Force; | ||
2186 | m_rootPart.Torque = m_rootPart.Torque; | ||
2187 | m_rootPart.Buoyancy = m_rootPart.Buoyancy; | ||
2188 | } | ||
2189 | } | 2182 | } |
2190 | 2183 | ||
2191 | public void SetOwnerId(UUID userId) | 2184 | public void SetOwnerId(UUID userId) |
@@ -3079,7 +3072,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3079 | { | 3072 | { |
3080 | // cancel physics | 3073 | // cancel physics |
3081 | RootPart.Flags &= ~PrimFlags.Physics; | 3074 | RootPart.Flags &= ~PrimFlags.Physics; |
3082 | ApplyPhysics(false); | 3075 | ApplyPhysics(); |
3083 | } | 3076 | } |
3084 | } | 3077 | } |
3085 | 3078 | ||