aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2015-09-04 16:37:45 +0100
committerUbitUmarov2015-09-04 16:37:45 +0100
commit9aaaf705f52fb4fbbad526d40ed74eba71152e1c (patch)
treeb6580652928d814c52d6d19536a2ea4743d82413 /OpenSim/Region
parentbug fix on ode spaces and allow more of them on large regions (diff)
downloadopensim-SC_OLD-9aaaf705f52fb4fbbad526d40ed74eba71152e1c.zip
opensim-SC_OLD-9aaaf705f52fb4fbbad526d40ed74eba71152e1c.tar.gz
opensim-SC_OLD-9aaaf705f52fb4fbbad526d40ed74eba71152e1c.tar.bz2
opensim-SC_OLD-9aaaf705f52fb4fbbad526d40ed74eba71152e1c.tar.xz
actually reduce max number of ode spaces
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs8
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs8
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 243a323..812b469 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -726,14 +726,14 @@ namespace OpenSim.Region.Physics.OdePlugin
726 spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY); 726 spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY);
727 727
728 // ubit: limit number of spaces 728 // ubit: limit number of spaces
729 if (spaceGridMaxX > 100) 729 if (spaceGridMaxX > 24)
730 { 730 {
731 spaceGridMaxX = 100; 731 spaceGridMaxX = 24;
732 spacesPerMeterX = spaceGridMaxX / WorldExtents.X ; 732 spacesPerMeterX = spaceGridMaxX / WorldExtents.X ;
733 } 733 }
734 if (spaceGridMaxY > 100) 734 if (spaceGridMaxY > 24)
735 { 735 {
736 spaceGridMaxY = 100; 736 spaceGridMaxY = 24;
737 spacesPerMeterY = spaceGridMaxY / WorldExtents.Y; 737 spacesPerMeterY = spaceGridMaxY / WorldExtents.Y;
738 } 738 }
739 739
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index c688727..e8c219c 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -552,15 +552,15 @@ namespace OpenSim.Region.Physics.OdePlugin
552 spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeterX); 552 spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeterX);
553 spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY); 553 spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeterY);
554 554
555 if (spaceGridMaxX > 100) 555 if (spaceGridMaxX > 24)
556 { 556 {
557 spaceGridMaxX = 100; 557 spaceGridMaxX = 24;
558 spacesPerMeterX = spaceGridMaxX / WorldExtents.X ; 558 spacesPerMeterX = spaceGridMaxX / WorldExtents.X ;
559 } 559 }
560 560
561 if (spaceGridMaxY > 100) 561 if (spaceGridMaxY > 24)
562 { 562 {
563 spaceGridMaxY = 100; 563 spaceGridMaxY = 24;
564 spacesPerMeterY = spaceGridMaxY / WorldExtents.Y ; 564 spacesPerMeterY = spaceGridMaxY / WorldExtents.Y ;
565 } 565 }
566 566