aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs1
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsReporter.cs8
3 files changed, 9 insertions, 4 deletions
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
421 public void StoreLandObject(Land parcel, LLUUID regionUUID) 421 public void StoreLandObject(Land parcel, LLUUID regionUUID)
422 { 422 {
423 // Does the new locking fix it? 423 // Does the new locking fix it?
424 m_log.Info("[DATASTORE]: Tedds temp fix: Waiting 3 seconds for stuff to catch up. (Someone please fix! :))"); 424 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! :))");
425 System.Threading.Thread.Sleep(2500 + rnd.Next(300, 900)); 425 System.Threading.Thread.Sleep(2500 + rnd.Next(0, 1000));
426 426
427 lock (m_dataSet) 427 lock (m_dataSet)
428 { 428 {
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
559 catch (Exception e) 559 catch (Exception e)
560 { 560 {
561 m_log.Warn("[HTTPD]: Error - " + e.Message); 561 m_log.Warn("[HTTPD]: Error - " + e.Message);
562 m_log.Warn("Tip: Do you have permission to listen on port " + m_port + "?");
562 } 563 }
563 } 564 }
564 565
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
50 50
51 public void AddTexture(AssetBase image) 51 public void AddTexture(AssetBase image)
52 { 52 {
53 texturesInCache++; 53 // Tedd: I added null check to avoid exception. Don't know if texturesInCache should ++ anyway?
54 textureCacheMemoryUsage += image.Data.Length; 54 if (image.Data != null)
55 {
56 texturesInCache++;
57 textureCacheMemoryUsage += image.Data.Length;
58 }
55 } 59 }
56 60
57 /// <summary> 61 /// <summary>