ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Use nini to pass config information to the client stack, rather than the ClientStackUserSettings class

Browse Source 
* This conforms better to other module usage
This commit is contained in:
Justin Clarke Casey
2008-11-03 18:33:35 +00:00
parent add42f5e9b
commit 8c71954e08
10 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -208,13 +208,13 @@ namespace OpenSim
/// <returns></returns>
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)
config = DefaultConfig.AddConfig("Startup");
config = defaultConfig.AddConfig("Startup");
config.Set("gridmode", false);
config.Set("physics", "basicphysics");
@@ -233,10 +233,10 @@ namespace OpenSim
}
{
IConfig config = DefaultConfig.Configs["StandAlone"];
IConfig config = defaultConfig.Configs["StandAlone"];
if (null == config)
config = DefaultConfig.AddConfig("StandAlone");
config = defaultConfig.AddConfig("StandAlone");
config.Set("accounts_authenticate", false);
config.Set("welcome_message", "Welcome to OpenSimulator");
@@ -250,10 +250,10 @@ namespace OpenSim
}
{
IConfig config = DefaultConfig.Configs["Network"];
IConfig config = defaultConfig.Configs["Network"];
if (null == config)
config = DefaultConfig.AddConfig("Network");
config = defaultConfig.AddConfig("Network");
config.Set("default_location_x", 1000);
config.Set("default_location_y", 1000);
@@ -270,7 +270,7 @@ namespace OpenSim
config.Set("secure_inventory_server", "true");
}
return DefaultConfig;
return defaultConfig;
}
protected virtual void ReadConfigSettings()
@@ -495,7 +495,7 @@ namespace OpenSim
}
IClientNetworkServer clientServer;
Scene scene = SetupScene(regionInfo, proxyOffset, null, out clientServer);
Scene scene = SetupScene(regionInfo, proxyOffset, m_config.Source, out clientServer);
m_log.Info("[MODULES]: Loading Region's modules");