aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-04-27 22:26:57 +0000
committerAdam Frisby2007-04-27 22:26:57 +0000
commitfadb4a9dccb56176b5a7a60ef345910654d6bb60 (patch)
tree9c022ddf2aecff7b56ea544a97a99cc778a8c724
parentMajor ass commit (diff)
downloadopensim-SC_OLD-fadb4a9dccb56176b5a7a60ef345910654d6bb60.zip
opensim-SC_OLD-fadb4a9dccb56176b5a7a60ef345910654d6bb60.tar.gz
opensim-SC_OLD-fadb4a9dccb56176b5a7a60ef345910654d6bb60.tar.bz2
opensim-SC_OLD-fadb4a9dccb56176b5a7a60ef345910654d6bb60.tar.xz
Dumb mistake - forgot to assign the datastore variable
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs2
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs1
-rw-r--r--OpenSim/Application.cs2
3 files changed, 4 insertions, 1 deletions
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
170 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 170 this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
171 this.physManager.LoadPlugins(); 171 this.physManager.LoadPlugins();
172 172
173 LocalWorld.m_datastore = this.regionData.DataStore;
174
173 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. 175 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
174 LocalWorld.LoadWorldMap(); 176 LocalWorld.LoadWorldMap();
175 177
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
50 50
51 public void Initialise(string dfile) 51 public void Initialise(string dfile)
52 { 52 {
53 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4LocalStorage Opening " + dfile);
53 datastore = dfile; 54 datastore = dfile;
54 try 55 try
55 { 56 {
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
70 } 70 }
71 catch (Exception e) 71 catch (Exception e)
72 { 72 {
73 Console.WriteLine("-config: Please specify a config file."); 73 Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
74 } 74 }
75 } 75 }
76 } 76 }