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

* SimpleApp works again:

Browse Source 
* NetworkServersInfo settable without config file
  * DefaultHomeLoc throws if getted before setted
  * Removed nonsensical sandbox distinction
  * Refactored default config file creation

* Some more small refactorings on shapes
This commit is contained in:
lbsa71
2007-08-06 10:48:40 +00:00
parent 6c03e9e50c
commit 9bdeb8af6f
7 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,30 +120,19 @@ namespace OpenSim
m_httpServer.AddStreamHandler(new SimStatusHandler());
}
if (m_sandbox)
string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
if (!Directory.Exists(regionConfigPath))
{
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
Directory.CreateDirectory(regionConfigPath);
}
else
{
m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
}
string path = Path.Combine(Util.configDir(), "Regions");
if (!Directory.Exists(path))
{
Directory.CreateDirectory(path);
}
string[] configFiles = Directory.GetFiles(path, "*.xml");
string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
if (configFiles.Length == 0)
{
string path2 = Path.Combine(Util.configDir(), "Regions");
string path3 = Path.Combine(path2, "default.xml");
RegionInfo regionInfo = new RegionInfo("DEFAULT REGION CONFIG", path3);
configFiles = Directory.GetFiles(path, "*.xml");
CreateDefaultRegionInfoXml(Path.Combine(regionConfigPath, "default.xml"));
configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
}
for (int i = 0; i < configFiles.Length; i++)
@@ -156,7 +145,6 @@ namespace OpenSim
m_localScenes.Add(scene);
m_udpServers.Add(udpServer);
m_regionData.Add(regionInfo);
}
@@ -170,6 +158,11 @@ namespace OpenSim
}
private static void CreateDefaultRegionInfoXml(string fileName)
{
new RegionInfo("DEFAULT REGION CONFIG", fileName);
}
protected override StorageManager CreateStorageManager(RegionInfo regionInfo)
{
return new StorageManager("OpenSim.DataStore.NullStorage.dll", regionInfo.DataStore, regionInfo.RegionName);

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

@@ -41,6 +41,7 @@ using libsecondlife;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Region.Communications.Local;
namespace OpenSim.Region.ClientStack
{
@@ -78,6 +79,7 @@ namespace OpenSim.Region.ClientStack
m_httpServer.Start();
m_inventoryCache = new InventoryCache();
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
}
protected abstract void Initialize();

4
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@@ -16,10 +16,10 @@ namespace OpenSim.Region.Communications.Local
private uint defaultHomeX ;
private uint defaultHomeY;
public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData)
public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo)
{
m_Parent = parent;
this.serversInfo = serversData;
this.serversInfo = serversInfo;
defaultHomeX = this.serversInfo.DefaultHomeLocX;
defaultHomeY = this.serversInfo.DefaultHomeLocY;
}

5
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@@ -35,8 +35,7 @@ namespace SimpleApp
StartLog();
m_networkServersInfo = new NetworkServersInfo( );
m_networkServersInfo = new NetworkServersInfo( 1000, 1000 );
LocalAssetServer assetServer = new LocalAssetServer();
assetServer.SetServerInfo("http://localhost:8003/", "");
@@ -48,8 +47,6 @@ namespace SimpleApp
{
base.StartUp();
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
m_log.Notice(m_log.LineInfo);
ScenePresence.PhysicsEngineFlying = true;