aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorAdam Frisby2007-04-27 21:11:02 +0000
committerAdam Frisby2007-04-27 21:11:02 +0000
commit6ce5b6e439e304ba8ce27a9e5bad3146feedd7f0 (patch)
treefa25cc297d83f70080b21f78e3bc04d32df5b00f /OpenSim.RegionServer
parent* Added new commandline option -config <configfile.xml> (diff)
downloadopensim-SC_OLD-6ce5b6e439e304ba8ce27a9e5bad3146feedd7f0.zip
opensim-SC_OLD-6ce5b6e439e304ba8ce27a9e5bad3146feedd7f0.tar.gz
opensim-SC_OLD-6ce5b6e439e304ba8ce27a9e5bad3146feedd7f0.tar.bz2
opensim-SC_OLD-6ce5b6e439e304ba8ce27a9e5bad3146feedd7f0.tar.xz
Major ass commit
Added new "Datastore" parameter to simconfig.xml which is passed to storage engines via a new Initialise() function.
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs13
-rw-r--r--OpenSim.RegionServer/world/World.cs4
2 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index 2f8bfa1..a1923f5 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -36,6 +36,8 @@ namespace OpenSim
36 public string UserRecvKey = ""; 36 public string UserRecvKey = "";
37 private bool isSandbox; 37 private bool isSandbox;
38 38
39 public string DataStore;
40
39 public RegionInfo() 41 public RegionInfo()
40 { 42 {
41 43
@@ -144,6 +146,17 @@ namespace OpenSim
144 { 146 {
145 this.RegionLocY = (uint)Convert.ToUInt32(attri); 147 this.RegionLocY = (uint)Convert.ToUInt32(attri);
146 } 148 }
149
150 // Local storage datastore
151 attri = "";
152 attri = configData.GetAttribute("Datastore");
153 if (attri == "")
154 {
155 string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
156 configData.SetAttribute("Datastore", datastore);
157 this.DataStore = datastore;
158 }
159
147 //Sim Listen Port 160 //Sim Listen Port
148 attri = ""; 161 attri = "";
149 attri = configData.GetAttribute("SimListenPort"); 162 attri = configData.GetAttribute("SimListenPort");
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 0e5dbf0..5443d38 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -44,6 +44,8 @@ namespace OpenSim.world
44 private AssetCache _assetCache; 44 private AssetCache _assetCache;
45 private Mutex updateLock; 45 private Mutex updateLock;
46 46
47 public string m_datastore;
48
47 /// <summary> 49 /// <summary>
48 /// Creates a new World class, and a region to go with it. 50 /// Creates a new World class, and a region to go with it.
49 /// </summary> 51 /// </summary>
@@ -257,6 +259,8 @@ namespace OpenSim.world
257 { 259 {
258 ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 260 ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
259 store = plug; 261 store = plug;
262
263 store.Initialise(this.m_datastore);
260 break; 264 break;
261 } 265 }
262 266