come up nicer on startup if the opensim.ini section isn't there

0.6.0-stable
Sean Dague 2008-09-03 18:04:42 +00:00
parent 4ddc7d66d6
commit 9082316757
1 changed files with 78 additions and 78 deletions

View File

@ -1,8 +1,6 @@
// ContentManagementModule.cs
// User: bongiojp
using System;
using System.Collections.Generic;
using libsecondlife;
@ -26,21 +24,23 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
CMView m_view = null;
bool initialised = false;
bool m_posted = false;
bool m_enabled = true;
bool m_enabled = false;
public void Initialise(Scene scene, IConfigSource source)
{
string databaseDir = "./";
string database = "FilesyStemDatabase";
string database = "FileSystemDatabase";
int channel = 345;
try
{
if (!source.Configs["CMS"].GetBoolean("Enabled", false))
m_enabled = false;
if (source.Configs["CMS"] == null)
return;
m_enabled = source.Configs["CMS"].GetBoolean("Enabled", false);
databaseDir = source.Configs["CMS"].GetString("Directory", databaseDir);
database = source.Configs["CMS"].GetString("Database", database);
channel = source.Configs["CMS"].GetInt("Channel", channel);
if (database != "FileSystemDatabase" && database != "GitDatabase")
{
m_log.ErrorFormat("[Content Management]: The Database attribute must be defined as either FileSystemDatabase or GitDatabase");