aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2012-02-05 20:58:04 +0000
committerMelanie2012-02-05 20:58:04 +0000
commit54fc78013d1eb946551656849e7007427ef4aec3 (patch)
treefae81b9031f5ae0fb07d0f3e61eb83946bbc26b1 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'master' into careminster (diff)
parentRevert my two quick fixes for the lag issue and put in the real fix, which (diff)
downloadopensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.zip
opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.gz
opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.bz2
opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6485710..34e0ab7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2838,9 +2838,9 @@ namespace OpenSim.Region.Framework.Scenes
2838 for (int i = 0; i < parts.Length; i++) 2838 for (int i = 0; i < parts.Length; i++)
2839 { 2839 {
2840 SceneObjectPart part = parts[i]; 2840 SceneObjectPart part = parts[i];
2841 if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || 2841 if (part.Scale.X > m_scene.m_maxPhys ||
2842 part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || 2842 part.Scale.Y > m_scene.m_maxPhys ||
2843 part.Scale.Z > m_scene.RegionInfo.PhysPrimMax) 2843 part.Scale.Z > m_scene.m_maxPhys )
2844 { 2844 {
2845 UsePhysics = false; // Reset physics 2845 UsePhysics = false; // Reset physics
2846 break; 2846 break;