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

Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-11-02 23:42:37 +01:00
parent ce8419fdd0 afde92d8cc
commit 26a4f32013
16 changed files with 120 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1479,8 +1479,8 @@ namespace OpenSim.Region.Framework.Scenes
avatar.StandUp();
if (!silent)
{
part.UpdateFlag = 0;
{
part.ClearUpdateSchedule();
if (part == m_rootPart)
{
if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) ||
@@ -2123,13 +2123,13 @@ namespace OpenSim.Region.Framework.Scenes
if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f))
{
m_rootPart.UpdateFlag = 1;
m_rootPart.UpdateFlag = UpdateRequired.TERSE;
lastPhysGroupPos = AbsolutePosition;
}
if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
{
m_rootPart.UpdateFlag = 1;
m_rootPart.UpdateFlag = UpdateRequired.TERSE;
lastPhysGroupRot = GroupRotation;
}