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

Small clean up of files and directories

Browse Source
This commit is contained in:
MW
2007-04-25 13:03:48 +00:00
parent 46eaa79cd9
commit f7b51d63a8
56 changed files with 515 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim.RegionServer/OpenSimMain.cs
View File

@@ -41,6 +41,7 @@ using libsecondlife.Packets;
using OpenSim.world;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.UserServer;
using OpenSim.Assets;
using OpenSim.CAPS;
@@ -82,7 +83,7 @@ namespace OpenSim
public string m_physicsEngine;
public bool m_sandbox = false;
public bool m_loginserver;
public OpenGridProtocolServer OGSServer;
public OpenGridProtocolServer OGSServer;
public bool user_accounts = false;
public bool gridLocalAsset = false;
@@ -205,8 +206,8 @@ namespace OpenSim
if (gridServer.GetName() == "Remote")
{
// should startup the OGS protocol server here
OGSServer = new OpenGridProtocolServer(8500);
// should startup the OGS protocol server here
//OGSServer = new OpenGridProtocolServer(8500);
// we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
httpServer.AddXmlRPCHandler("expect_user",
@@ -298,12 +299,13 @@ namespace OpenSim
m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
httpServer.Start();
if(gridServer.GetName() == "Remote") {
m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
OGSServer.Start();
}
if (gridServer.GetName() == "Remote")
{
m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
OGSServer.Start();
}
MainServerListener();
m_heartbeatTimer.Enabled = true;
@@ -523,7 +525,7 @@ namespace OpenSim
case "terrain":
string result = "";
if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result))
if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
{
m_console.WriteLine(result);
}