aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorBlueWall2012-02-05 12:38:20 -0500
committerBlueWall2012-02-05 12:38:20 -0500
commit4e11983c7c2ba153f3d359e9b5a587fc966deb09 (patch)
tree1b23867dc74676a0fe656aeec8b2751d40566e6f /OpenSim/Region/Framework/Scenes
parentCheck ban list for a particular parcel only when an avatar moves into it. (diff)
downloadopensim-SC_OLD-4e11983c7c2ba153f3d359e9b5a587fc966deb09.zip
opensim-SC_OLD-4e11983c7c2ba153f3d359e9b5a587fc966deb09.tar.gz
opensim-SC_OLD-4e11983c7c2ba153f3d359e9b5a587fc966deb09.tar.bz2
opensim-SC_OLD-4e11983c7c2ba153f3d359e9b5a587fc966deb09.tar.xz
Make configuration uniform
Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-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 e7f2fdb..8939342 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2423,9 +2423,9 @@ namespace OpenSim.Region.Framework.Scenes
2423 for (int i = 0; i < parts.Length; i++) 2423 for (int i = 0; i < parts.Length; i++)
2424 { 2424 {
2425 SceneObjectPart part = parts[i]; 2425 SceneObjectPart part = parts[i];
2426 if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || 2426 if (part.Scale.X > m_scene.m_maxPhys ||
2427 part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || 2427 part.Scale.Y > m_scene.m_maxPhys ||
2428 part.Scale.Z > m_scene.RegionInfo.PhysPrimMax) 2428 part.Scale.Z > m_scene.m_maxPhys )
2429 { 2429 {
2430 UsePhysics = false; // Reset physics 2430 UsePhysics = false; // Reset physics
2431 break; 2431 break;