diff options
author | MW | 2007-03-08 13:21:24 +0000 |
---|---|---|
committer | MW | 2007-03-08 13:21:24 +0000 |
commit | f60bc970eb925cd245cc77b1ae700b28d4589163 (patch) | |
tree | d279883582f00232bad87bf17e5727ff263027a4 /src/Main.cs | |
parent | Brought OGS.sql back into trunk (diff) | |
download | opensim-SC-f60bc970eb925cd245cc77b1ae700b28d4589163.zip opensim-SC-f60bc970eb925cd245cc77b1ae700b28d4589163.tar.gz opensim-SC-f60bc970eb925cd245cc77b1ae700b28d4589163.tar.bz2 opensim-SC-f60bc970eb925cd245cc77b1ae700b28d4589163.tar.xz |
Another attemp to fix the Session Logout bug
World map data is now saved in database and recovered on startup.
Primitives are now backed up to a local database and reloaded on startup.
Diffstat (limited to 'src/Main.cs')
-rw-r--r-- | src/Main.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Main.cs b/src/Main.cs index 4fc7d54..600ce38 100644 --- a/src/Main.cs +++ b/src/Main.cs | |||
@@ -150,9 +150,13 @@ namespace OpenSim | |||
150 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); | 150 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); |
151 | local_world.PhysScene = this.physManager.GetPhysicsScene("PhysX"); //should be reading from the config file what physics engine to use | 151 | local_world.PhysScene = this.physManager.GetPhysicsScene("PhysX"); //should be reading from the config file what physics engine to use |
152 | local_world.PhysScene.SetTerrain(local_world.LandMap); | 152 | local_world.PhysScene.SetTerrain(local_world.LandMap); |
153 | |||
153 | OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); | 154 | OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); |
154 | OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); | 155 | OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); |
155 | 156 | ||
157 | local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. | ||
158 | local_world.LoadPrimsFromStorage(); | ||
159 | |||
156 | MainServerListener(); | 160 | MainServerListener(); |
157 | 161 | ||
158 | } | 162 | } |
@@ -230,6 +234,7 @@ namespace OpenSim | |||
230 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Killing clients"); | 234 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Killing clients"); |
231 | // IMPLEMENT THIS | 235 | // IMPLEMENT THIS |
232 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Closing console and terminating"); | 236 | ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Shutdown() - Closing console and terminating"); |
237 | OpenSim_Main.local_world.Close(); | ||
233 | ServerConsole.MainConsole.Instance.Close(); | 238 | ServerConsole.MainConsole.Instance.Close(); |
234 | Environment.Exit(0); | 239 | Environment.Exit(0); |
235 | } | 240 | } |