diff options
author | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
commit | a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec (patch) | |
tree | f26aa58d3a31ea6460a9cb76cc70a2ccb34945cc /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Change default say distance to 20m from 30m, the same as on the big grid. Th... (diff) | |
parent | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size (diff) | |
download | opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.zip opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.gz opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.bz2 opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 2ea9854..a0a7344 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1157,7 +1157,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1157 | 1157 | ||
1158 | if (!silent) | 1158 | if (!silent) |
1159 | { | 1159 | { |
1160 | part.UpdateFlag = 0; | 1160 | part.ClearUpdateSchedule(); |
1161 | if (part == m_rootPart) | 1161 | if (part == m_rootPart) |
1162 | { | 1162 | { |
1163 | if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || | 1163 | if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || |
@@ -1735,13 +1735,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1735 | 1735 | ||
1736 | if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f)) | 1736 | if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f)) |
1737 | { | 1737 | { |
1738 | m_rootPart.UpdateFlag = 1; | 1738 | m_rootPart.UpdateFlag = UpdateRequired.TERSE; |
1739 | lastPhysGroupPos = AbsolutePosition; | 1739 | lastPhysGroupPos = AbsolutePosition; |
1740 | } | 1740 | } |
1741 | 1741 | ||
1742 | if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f)) | 1742 | if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f)) |
1743 | { | 1743 | { |
1744 | m_rootPart.UpdateFlag = 1; | 1744 | m_rootPart.UpdateFlag = UpdateRequired.TERSE; |
1745 | lastPhysGroupRot = GroupRotation; | 1745 | lastPhysGroupRot = GroupRotation; |
1746 | } | 1746 | } |
1747 | 1747 | ||