From fadb4a9dccb56176b5a7a60ef345910654d6bb60 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 27 Apr 2007 22:26:57 +0000
Subject: Dumb mistake - forgot to assign the datastore variable

---
 OpenSim.RegionServer/OpenSimMain.cs                 | 2 ++
 OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs | 1 +
 OpenSim/Application.cs                              | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 20fffc8..062986c 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -170,6 +170,8 @@ namespace OpenSim
             this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
             this.physManager.LoadPlugins();
 
+            LocalWorld.m_datastore = this.regionData.DataStore;
+
             LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
             LocalWorld.LoadWorldMap();
 
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 3c17f1f..95cae8a 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
 
         public void Initialise(string dfile)
         {
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage Opening " + dfile);
             datastore = dfile;
             try
             {
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs
index 7d8be59..568d6fe 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim/Application.cs
@@ -70,7 +70,7 @@ namespace OpenSim
                     }
                     catch (Exception e)
                     {
-                        Console.WriteLine("-config: Please specify a config file.");
+                        Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
                     }
                 }
             }
-- 
cgit v1.1