From d9e45332022b18b50f00353588afd4bbe3392870 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 13 Jan 2008 07:14:54 +0000
Subject: * Fixed an overflow in the land manager * Did some goofy math undoing
 in the Sim Stats Reporter * More reduction to the amount of calls per second
 to UnManaged ODE code * Added a significant amount of comments to ODE

---
 OpenSim/Region/Environment/LandManagement/LandManager.cs | 14 ++++++++++++--
 OpenSim/Region/Environment/Scenes/SimStatsReporter.cs    |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index 22e7fc9..3969932 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -243,8 +243,18 @@ namespace OpenSim.Region.Environment.LandManagement
         /// <returns>Land object at the point supplied</returns>
         public Land getLandObject(float x_float, float y_float)
         {
-            int x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float)/Convert.ToDouble(4.0)));
-            int y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float)/Convert.ToDouble(4.0)));
+            int x;
+            int y;
+
+            try
+            {
+                x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
+                y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
+            }
+            catch (System.OverflowException)
+            {
+                return null;
+            }
 
             if (x >= 64 || y >= 64 || x < 0 || y < 0)
             {
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index 420769c..1b2ff9a 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -111,8 +111,8 @@ namespace OpenSim.Region.Environment.Scenes
 
             float physfps = (m_pfps/statsUpdatesEveryMS);
 
-            if (physfps > 500)
-                physfps = physfps - (physfps - 500);
+            //if (physfps > 600)
+                //physfps = physfps - (physfps - 600);
 
             if (physfps < 0)
                 physfps = 0;
-- 
cgit v1.1