diff options
Diffstat (limited to 'src/Config.cs')
| -rw-r--r-- | src/Config.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Config.cs b/src/Config.cs index d4a0797..f85e4d5 100644 --- a/src/Config.cs +++ b/src/Config.cs | |||
| @@ -106,18 +106,19 @@ namespace OpenSim | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | public World LoadWorld() { | 108 | public World LoadWorld() { |
| 109 | IObjectSet world_result = db.Get(typeof(OpenSim.world.World)); | 109 | Console.WriteLine("Config.cs:LoadWorld() - Looking for a world object in local DB"); |
| 110 | if(world_result.Count==1) { | 110 | // IObjectSet world_result = db.Get(typeof(OpenSim.world.World)); |
| 111 | // if(world_result.Count==1) { | ||
| 111 | Console.WriteLine("Config.cs:LoadWorld() - Found an OpenSim.world.World object in local database, loading"); | 112 | Console.WriteLine("Config.cs:LoadWorld() - Found an OpenSim.world.World object in local database, loading"); |
| 112 | return (World)world_result.Next(); | 113 | //return (World)world_result.Next(); |
| 113 | } else { | 114 | // } else { |
| 114 | Console.WriteLine("Config.cs:LoadWorld() - Could not find the world or too many worlds! Constructing blank one"); | 115 | Console.WriteLine("Config.cs:LoadWorld() - Could not find the world or too many worlds! Constructing blank one"); |
| 115 | World blank = new World(); | 116 | World blank = new World(); |
| 116 | Console.WriteLine("Config.cs:LoadWorld() - Saving initial world state to disk"); | 117 | Console.WriteLine("Config.cs:LoadWorld() - Saving initial world state to disk"); |
| 117 | db.Set(blank); | 118 | db.Set(blank); |
| 118 | db.Commit(); | 119 | db.Commit(); |
| 119 | return blank; | 120 | return blank; |
| 120 | } | 121 | // } |
| 121 | } | 122 | } |
| 122 | 123 | ||
| 123 | public void LoadFromGrid() { | 124 | public void LoadFromGrid() { |