From 038774de30ce26120c91ccd8e1cda1b2a89e1841 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 29 Jul 2007 09:37:29 +0000
Subject: Commit 1/2 * DB4o no longer crashes the sim on Startup * DB4o now
 crashes the sim on shutdown. * Variety of console verbosity fixes.

---
 OpenSim/Region/Environment/Scenes/Primitive.cs | 3 ++-
 OpenSim/Region/Environment/StorageManager.cs   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index ce5c327..5f5113d 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -171,7 +171,8 @@ namespace OpenSim.Region.Environment.Scenes
 
         ~Primitive()
         {
-            OnPrimCountTainted();
+            if (OnPrimCountTainted != null)
+                OnPrimCountTainted();
         }
 
         #endregion
diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index fb12c4d..a7d67d3 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -32,6 +32,7 @@ namespace OpenSim.Region.Environment
 
         public StorageManager(string dllName, string dataStoreFile, string dataStoreDB)
         {
+            OpenSim.Framework.Console.MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName);
             Assembly pluginAssembly = Assembly.LoadFrom(dllName);
 
             foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -46,6 +47,8 @@ namespace OpenSim.Region.Environment
                         plug.Initialise(dataStoreFile, dataStoreDB);
 
                         m_dataStore = plug;
+
+                        OpenSim.Framework.Console.MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface");
                     }
 
                     typeInterface = null;
-- 
cgit v1.1