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

*New Configuration System, much easier and less buggy compared to the original system in place

Browse Source 
*View RegionInfo.cs for an example on how it works!
*This hopefully copies all the files over, but who knows :)
This commit is contained in:
mingchen
2007-07-18 23:15:08 +00:00
parent 4cd9a87183
commit 222becc879
20 changed files with 796 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -37,7 +37,7 @@ using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Types;
using OpenSim.GenericConfig;
using OpenSim.Framework.Configuration;
using OpenSim.Physics.Manager;
using OpenSim.Region.Caches;
using OpenSim.Region.ClientStack;
@@ -85,6 +85,9 @@ namespace OpenSim
/// </summary>
public override void StartUp()
{
m_log = new LogBase(m_logFilename, "Region", this, m_silent);
MainLog.Instance = m_log;
base.StartUp();
if (!m_sandbox)
@@ -108,27 +111,16 @@ namespace OpenSim
{
string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
string path3 = Path.Combine(path2, "default.xml");
Console.WriteLine("Creating default region config file");
//TODO create default region
IGenericConfig defaultConfig = new XmlConfig(path3);
defaultConfig.LoadData();
defaultConfig.Commit();
defaultConfig.Close();
defaultConfig = null;
RegionInfo regionInfo = new RegionInfo("DEFAULT REGION CONFIG", path3);
configFiles = Directory.GetFiles(path, "*.xml");
}
for (int i = 0; i < configFiles.Length; i++)
{
Console.WriteLine("Loading region config file");
IGenericConfig regionConfig = new XmlConfig(configFiles[i]);
RegionInfo regionInfo = new RegionInfo();
regionConfig.LoadData();
regionInfo.InitConfig(this.m_sandbox, regionConfig);
regionConfig.Close();
RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]);
UDPServer udpServer;
Scene scene = SetupScene(regionInfo, out udpServer);
@@ -159,21 +151,7 @@ namespace OpenSim
protected override void Initialize()
{
IGenericConfig localConfig = new XmlConfig(m_configFileName);
localConfig.LoadData();
if (m_useConfigFile)
{
SetupFromConfigFile(localConfig);
}
StartLog();
m_networkServersInfo.InitConfig(m_sandbox, localConfig);
m_httpServerPort = m_networkServersInfo.HttpListenerPort;
localConfig.Close();
m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
}

1
OpenSim/Region/ClientStack/PacketServer.cs
View File

@@ -31,6 +31,7 @@ using System.Net.Sockets;
using libsecondlife.Packets;
using OpenSim.Assets;
using OpenSim.Framework;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Region.Caches;

4
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@@ -65,9 +65,9 @@ namespace OpenSim.Region.ClientStack
virtual public void StartUp()
{
ClientView.TerrainManager = new TerrainManager(new SecondLife());
m_networkServersInfo = new NetworkServersInfo();
RegionInfo m_regionInfo = new RegionInfo();
m_networkServersInfo = new NetworkServersInfo("NETWORK SERVERS INFO", "network_servers_information.xml");
Initialize();

1
OpenSim/Region/ClientStack/UDPServer.cs
View File

@@ -32,6 +32,7 @@ using System.Net.Sockets;
using libsecondlife.Packets;
using OpenSim.Assets;
using OpenSim.Framework;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Region.Caches;

1
OpenSim/Region/Environment/RegionManager.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic;
using OpenSim.Framework;
using OpenSim.Framework.Types;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Region.Capabilities;