ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

actually that was redundante, already done at low level

Browse Source
This commit is contained in:
UbitUmarov
2016-07-27 21:31:43 +01:00
parent 8c46ab02c7
commit 32e30afbcb
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -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();

15
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -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();
}
}