aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-12-03 20:21:10 -0500
committerTeravus Ovares (Dan Olivares)2009-12-03 20:21:10 -0500
commit781db43a7665cf0c219889e85eadd7cdc4e8b79b (patch)
tree34c3541205de706fafca376ee2fe27d7cd2f467d /OpenSim/Region/Framework/Scenes
parent* Move code from that last commit to LLClientView since it's a linden client ... (diff)
downloadopensim-SC_OLD-781db43a7665cf0c219889e85eadd7cdc4e8b79b.zip
opensim-SC_OLD-781db43a7665cf0c219889e85eadd7cdc4e8b79b.tar.gz
opensim-SC_OLD-781db43a7665cf0c219889e85eadd7cdc4e8b79b.tar.bz2
opensim-SC_OLD-781db43a7665cf0c219889e85eadd7cdc4e8b79b.tar.xz
* Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
* Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section. * Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7359011..6badaf5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2589,7 +2589,9 @@ namespace OpenSim.Region.Framework.Scenes
2589 { 2589 {
2590 foreach (SceneObjectPart part in m_parts.Values) 2590 foreach (SceneObjectPart part in m_parts.Values)
2591 { 2591 {
2592 if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) 2592 if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax ||
2593 part.Scale.Y > m_scene.RegionInfo.PhysPrimMax ||
2594 part.Scale.Z > m_scene.RegionInfo.PhysPrimMax)
2593 { 2595 {
2594 UsePhysics = false; // Reset physics 2596 UsePhysics = false; // Reset physics
2595 break; 2597 break;