OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties.

0.6.0-stable
Jeff Ames 2008-11-06 01:56:42 +00:00
parent f7f448bc78
commit 1c4d6544d5
2 changed files with 356 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

320
OpenSim/Framework/ConfigSettings.cs
View File

@ -1,160 +1,160 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public class ConfigSettings public class ConfigSettings
{ {
private string m_physicsEngine; private string m_physicsEngine;
public string PhysicsEngine public string PhysicsEngine
{ {
get { return m_physicsEngine; } get { return m_physicsEngine; }
set { m_physicsEngine = value; } set { m_physicsEngine = value; }
} }
private string m_meshEngineName; private string m_meshEngineName;
public string MeshEngineName public string MeshEngineName
{ {
get { return m_meshEngineName; } get { return m_meshEngineName; }
set { m_meshEngineName = value; } set { m_meshEngineName = value; }
} }
private bool m_standalone; private bool m_standalone;
public bool Standalone public bool Standalone
{ {
get { return m_standalone; } get { return m_standalone; }
set { m_standalone = value; } set { m_standalone = value; }
} }
private bool m_see_into_region_from_neighbor; private bool m_see_into_region_from_neighbor;
public bool See_into_region_from_neighbor public bool See_into_region_from_neighbor
{ {
get { return m_see_into_region_from_neighbor; } get { return m_see_into_region_from_neighbor; }
set { m_see_into_region_from_neighbor = value; } set { m_see_into_region_from_neighbor = value; }
} }
private string m_storageDll; private string m_storageDll;
public string StorageDll public string StorageDll
{ {
get { return m_storageDll; } get { return m_storageDll; }
set { m_storageDll = value; } set { m_storageDll = value; }
} }
private string m_clientstackDll; private string m_clientstackDll;
public string ClientstackDll public string ClientstackDll
{ {
get { return m_clientstackDll; } get { return m_clientstackDll; }
set { m_clientstackDll = value; } set { m_clientstackDll = value; }
} }
private bool m_physicalPrim; private bool m_physicalPrim;
public bool PhysicalPrim public bool PhysicalPrim
{ {
get { return m_physicalPrim; } get { return m_physicalPrim; }
set { m_physicalPrim = value; } set { m_physicalPrim = value; }
} }
private bool m_standaloneAuthenticate = false; private bool m_standaloneAuthenticate = false;
public bool StandaloneAuthenticate public bool StandaloneAuthenticate
{ {
get { return m_standaloneAuthenticate; } get { return m_standaloneAuthenticate; }
set { m_standaloneAuthenticate = value; } set { m_standaloneAuthenticate = value; }
} }
private string m_standaloneWelcomeMessage = null; private string m_standaloneWelcomeMessage = null;
public string StandaloneWelcomeMessage public string StandaloneWelcomeMessage
{ {
get { return m_standaloneWelcomeMessage; } get { return m_standaloneWelcomeMessage; }
set { m_standaloneWelcomeMessage = value; } set { m_standaloneWelcomeMessage = value; }
} }
private string m_standaloneInventoryPlugin; private string m_standaloneInventoryPlugin;
public string StandaloneInventoryPlugin public string StandaloneInventoryPlugin
{ {
get { return m_standaloneInventoryPlugin; } get { return m_standaloneInventoryPlugin; }
set { m_standaloneInventoryPlugin = value; } set { m_standaloneInventoryPlugin = value; }
} }
private string m_standaloneAssetPlugin; private string m_standaloneAssetPlugin;
public string StandaloneAssetPlugin public string StandaloneAssetPlugin
{ {
get { return m_standaloneAssetPlugin; } get { return m_standaloneAssetPlugin; }
set { m_standaloneAssetPlugin = value; } set { m_standaloneAssetPlugin = value; }
} }
private string m_standaloneUserPlugin; private string m_standaloneUserPlugin;
public string StandaloneUserPlugin public string StandaloneUserPlugin
{ {
get { return m_standaloneUserPlugin; } get { return m_standaloneUserPlugin; }
set { m_standaloneUserPlugin = value; } set { m_standaloneUserPlugin = value; }
} }
private string m_standaloneInventorySource; private string m_standaloneInventorySource;
public string StandaloneInventorySource public string StandaloneInventorySource
{ {
get { return m_standaloneInventorySource; } get { return m_standaloneInventorySource; }
set { m_standaloneInventorySource = value; } set { m_standaloneInventorySource = value; }
} }
private string m_standaloneAssetSource; private string m_standaloneAssetSource;
public string StandaloneAssetSource public string StandaloneAssetSource
{ {
get { return m_standaloneAssetSource; } get { return m_standaloneAssetSource; }
set { m_standaloneAssetSource = value; } set { m_standaloneAssetSource = value; }
} }
private string m_standaloneUserSource; private string m_standaloneUserSource;
public string StandaloneUserSource public string StandaloneUserSource
{ {
get { return m_standaloneUserSource; } get { return m_standaloneUserSource; }
set { m_standaloneUserSource = value; } set { m_standaloneUserSource = value; }
} }
private string m_assetStorage = "local"; private string m_assetStorage = "local";
public string AssetStorage public string AssetStorage
{ {
get { return m_assetStorage; } get { return m_assetStorage; }
set { m_assetStorage = value; } set { m_assetStorage = value; }
} }
protected string m_storageConnectionString; protected string m_storageConnectionString;
public string StorageConnectionString public string StorageConnectionString
{ {
get { return m_storageConnectionString; } get { return m_storageConnectionString; }
set { m_storageConnectionString = value; } set { m_storageConnectionString = value; }
} }
protected string m_estateConnectionString; protected string m_estateConnectionString;
public string EstateConnectionString public string EstateConnectionString
{ {
get { return m_estateConnectionString; } get { return m_estateConnectionString; }
set { m_estateConnectionString = value; } set { m_estateConnectionString = value; }
} }
protected bool m_dumpAssetsToFile; protected bool m_dumpAssetsToFile;
public bool DumpAssetsToFile public bool DumpAssetsToFile
{ {
get { return m_dumpAssetsToFile; } get { return m_dumpAssetsToFile; }
set { m_dumpAssetsToFile = value; } set { m_dumpAssetsToFile = value; }
} }
} }
} }

392
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -1,196 +1,196 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.IO; using System.IO;
using OpenSim.Framework; using OpenSim.Framework;
using Nini; using Nini;
using Nini.Config; using Nini.Config;
namespace OpenSim namespace OpenSim
{ {
public class ConfigurationLoader public class ConfigurationLoader
{ {
protected ConfigSettings m_configSettings; protected ConfigSettings m_configSettings;
protected OpenSimConfigSource m_config; protected OpenSimConfigSource m_config;
protected NetworkServersInfo m_networkServersInfo; protected NetworkServersInfo m_networkServersInfo;
public ConfigurationLoader() public ConfigurationLoader()
{ {
} }
public OpenSimConfigSource LoadConfigSettings(IConfigSource configSource, out ConfigSettings configSettings, out NetworkServersInfo networkInfo) public OpenSimConfigSource LoadConfigSettings(IConfigSource configSource, out ConfigSettings configSettings, out NetworkServersInfo networkInfo)
{ {
m_configSettings = configSettings = new ConfigSettings(); m_configSettings = configSettings = new ConfigSettings();
m_networkServersInfo = networkInfo = new NetworkServersInfo(); m_networkServersInfo = networkInfo = new NetworkServersInfo();
bool iniFileExists = false; bool iniFileExists = false;
IConfig startupConfig = configSource.Configs["Startup"]; IConfig startupConfig = configSource.Configs["Startup"];
string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini"); string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini");
Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName); Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName);
string masterFileName = startupConfig.GetString("inimaster", ""); string masterFileName = startupConfig.GetString("inimaster", "");
string masterfilePath = Path.Combine(Util.configDir(), masterFileName); string masterfilePath = Path.Combine(Util.configDir(), masterFileName);
m_config = new OpenSimConfigSource(); m_config = new OpenSimConfigSource();
m_config.Source = new IniConfigSource(); m_config.Source = new IniConfigSource();
m_config.Source.Merge(DefaultConfig()); m_config.Source.Merge(DefaultConfig());
//check for .INI file (either default or name passed in command line) //check for .INI file (either default or name passed in command line)
if (File.Exists(masterfilePath)) if (File.Exists(masterfilePath))
{ {
m_config.Source.Merge(new IniConfigSource(masterfilePath)); m_config.Source.Merge(new IniConfigSource(masterfilePath));
} }
if (File.Exists(Application.iniFilePath)) if (File.Exists(Application.iniFilePath))
{ {
iniFileExists = true; iniFileExists = true;
// From reading Nini's code, it seems that later merged keys replace earlier ones. // From reading Nini's code, it seems that later merged keys replace earlier ones.
m_config.Source.Merge(new IniConfigSource(Application.iniFilePath)); m_config.Source.Merge(new IniConfigSource(Application.iniFilePath));
} }
else else
{ {
// check for a xml config file // check for a xml config file
Application.iniFilePath = Path.Combine(Util.configDir(), "OpenSim.xml"); Application.iniFilePath = Path.Combine(Util.configDir(), "OpenSim.xml");
if (File.Exists(Application.iniFilePath)) if (File.Exists(Application.iniFilePath))
{ {
iniFileExists = true; iniFileExists = true;
m_config.Source = new XmlConfigSource(); m_config.Source = new XmlConfigSource();
m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));
} }
} }
m_config.Source.Merge(configSource); m_config.Source.Merge(configSource);
if (!iniFileExists) if (!iniFileExists)
m_config.Save("OpenSim.ini"); m_config.Save("OpenSim.ini");
ReadConfigSettings(); ReadConfigSettings();
return m_config; return m_config;
} }
/// <summary> /// <summary>
/// Setup a default config values in case they aren't present in the ini file /// Setup a default config values in case they aren't present in the ini file
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static IConfigSource DefaultConfig() public static IConfigSource DefaultConfig()
{ {
IConfigSource defaultConfig = new IniConfigSource(); IConfigSource defaultConfig = new IniConfigSource();
{ {
IConfig config = defaultConfig.Configs["Startup"]; IConfig config = defaultConfig.Configs["Startup"];
if (null == config) if (null == config)
config = defaultConfig.AddConfig("Startup"); config = defaultConfig.AddConfig("Startup");
config.Set("gridmode", false); config.Set("gridmode", false);
config.Set("physics", "basicphysics"); config.Set("physics", "basicphysics");
config.Set("meshing", "ZeroMesher"); config.Set("meshing", "ZeroMesher");
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", true); config.Set("see_into_this_sim_from_neighbor", true);
config.Set("serverside_object_permissions", false); config.Set("serverside_object_permissions", false);
config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true); config.Set("storage_prim_inventories", true);
config.Set("startup_console_commands_file", String.Empty); config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty); config.Set("shutdown_console_commands_file", String.Empty);
config.Set("DefaultScriptEngine", "ScriptEngine.DotNetEngine"); config.Set("DefaultScriptEngine", "ScriptEngine.DotNetEngine");
config.Set("asset_database", "sqlite"); config.Set("asset_database", "sqlite");
config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
} }
{ {
IConfig config = defaultConfig.Configs["StandAlone"]; IConfig config = defaultConfig.Configs["StandAlone"];
if (null == config) if (null == config)
config = defaultConfig.AddConfig("StandAlone"); config = defaultConfig.AddConfig("StandAlone");
config.Set("accounts_authenticate", false); config.Set("accounts_authenticate", false);
config.Set("welcome_message", "Welcome to OpenSimulator"); config.Set("welcome_message", "Welcome to OpenSimulator");
config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
config.Set("inventory_source", ""); config.Set("inventory_source", "");
config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
config.Set("user_source", ""); config.Set("user_source", "");
config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
config.Set("asset_source", ""); config.Set("asset_source", "");
config.Set("dump_assets_to_file", false); config.Set("dump_assets_to_file", false);
} }
{ {
IConfig config = defaultConfig.Configs["Network"]; IConfig config = defaultConfig.Configs["Network"];
if (null == config) if (null == config)
config = defaultConfig.AddConfig("Network"); config = defaultConfig.AddConfig("Network");
config.Set("default_location_x", 1000); config.Set("default_location_x", 1000);
config.Set("default_location_y", 1000); config.Set("default_location_y", 1000);
config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort);
config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort);
config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
config.Set("grid_send_key", "null"); config.Set("grid_send_key", "null");
config.Set("grid_recv_key", "null"); config.Set("grid_recv_key", "null");
config.Set("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()); config.Set("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
config.Set("user_send_key", "null"); config.Set("user_send_key", "null");
config.Set("user_recv_key", "null"); config.Set("user_recv_key", "null");
config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()); config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString());
config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
config.Set("secure_inventory_server", "true"); config.Set("secure_inventory_server", "true");
} }
return defaultConfig; return defaultConfig;
} }
protected virtual void ReadConfigSettings() protected virtual void ReadConfigSettings()
{ {
IConfig startupConfig = m_config.Source.Configs["Startup"]; IConfig startupConfig = m_config.Source.Configs["Startup"];
if (startupConfig != null) if (startupConfig != null)
{ {
m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode"); m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode");
m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim"); m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim");
m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor"); m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor");
m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll") if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
{ {
m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll"; m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
Thread.Sleep(3000); Thread.Sleep(3000);
} }
m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string"); m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string");
m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin"); m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin");
} }
IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
if (standaloneConfig != null) if (standaloneConfig != null)
{ {
m_configSettings.StandaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate"); m_configSettings.StandaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate");
m_configSettings.StandaloneWelcomeMessage = standaloneConfig.GetString("welcome_message"); m_configSettings.StandaloneWelcomeMessage = standaloneConfig.GetString("welcome_message");
m_configSettings.StandaloneInventoryPlugin = standaloneConfig.GetString("inventory_plugin"); m_configSettings.StandaloneInventoryPlugin = standaloneConfig.GetString("inventory_plugin");
m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source"); m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source");
m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin"); m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin");
m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source"); m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source");
m_configSettings.StandaloneAssetPlugin = standaloneConfig.GetString("asset_plugin"); m_configSettings.StandaloneAssetPlugin = standaloneConfig.GetString("asset_plugin");
m_configSettings.StandaloneAssetSource = standaloneConfig.GetString("asset_source"); m_configSettings.StandaloneAssetSource = standaloneConfig.GetString("asset_source");
m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file"); m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file");
} }
m_networkServersInfo.loadFromConfiguration(m_config.Source); m_networkServersInfo.loadFromConfiguration(m_config.Source);
} }
} }
} }