From c62328950a3e4ad30dbe972db11d05ca7519d6de Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Mon, 18 Feb 2008 14:21:51 +0000
Subject: More exception checks and crash hints If no scriptengine is specified
 then don't try to load any.

---
 OpenSim/Framework/Data.MySQL/MySQLDataStore.cs        | 4 ++--
 OpenSim/Framework/Servers/BaseHttpServer.cs           | 1 +
 OpenSim/Framework/Statistics/SimExtraStatsReporter.cs | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index 9518724..1edaa52 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -421,8 +421,8 @@ namespace OpenSim.Framework.Data.MySQL
         public void StoreLandObject(Land parcel, LLUUID regionUUID)
         {
             // Does the new locking fix it?
-            m_log.Info("[DATASTORE]: Tedds temp fix: Waiting 3 seconds for stuff to catch up. (Someone please fix! :))");
-            System.Threading.Thread.Sleep(2500 + rnd.Next(300, 900));
+            m_log.Info("[DATASTORE]: Tedds temp fix: Waiting 3 seconds to avoid others writing to table while we hold a dataset of it. (Someone please fix! :))");
+            System.Threading.Thread.Sleep(2500 + rnd.Next(0, 1000));
             
             lock (m_dataSet)
             {
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index cc0c0d0..6b576e6 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -559,6 +559,7 @@ namespace OpenSim.Framework.Servers
             catch (Exception e)
             {
                 m_log.Warn("[HTTPD]: Error - " + e.Message);
+                m_log.Warn("Tip: Do you have permission to listen on port " + m_port + "?");
             }
         }
 
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
index 73f36f9..c8b8223 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
@@ -50,8 +50,12 @@ namespace OpenSim.Framework.Statistics
         
         public void AddTexture(AssetBase image)
         {
-            texturesInCache++;
-            textureCacheMemoryUsage += image.Data.Length;
+            // Tedd: I added null check to avoid exception. Don't know if texturesInCache should ++ anyway?
+            if (image.Data != null)
+            {
+                texturesInCache++;
+                textureCacheMemoryUsage += image.Data.Length;
+            }
         }        
 
         /// <summary>
-- 
cgit v1.1