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

0.1-prestable
MW 2007-05-07 16:23:33 +00:00
parent 40eb8bc8b6
commit 3d0fff1c09
1 changed files with 104 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -150,19 +150,25 @@ namespace OpenSim
m_console.WriteLine("Starting in Grid mode"); m_console.WriteLine("Starting in Grid mode");
} }
try { try
{
GridServers.Initialise(); GridServers.Initialise();
} catch (Exception e) { }
catch (Exception e)
{
m_console.WriteLine(e.Message + "\nSorry, could not setup the grid interface"); m_console.WriteLine(e.Message + "\nSorry, could not setup the grid interface");
Environment.Exit(1); Environment.Exit(1);
} }
startuptime = DateTime.Now; startuptime = DateTime.Now;
try { try
{
AssetCache = new AssetCache(GridServers.AssetServer); AssetCache = new AssetCache(GridServers.AssetServer);
InventoryCache = new InventoryCache(); InventoryCache = new InventoryCache();
} catch (Exception e) { }
catch (Exception e)
{
m_console.WriteLine(e.Message + "\nSorry, could not setup local cache"); m_console.WriteLine(e.Message + "\nSorry, could not setup local cache");
Environment.Exit(1); Environment.Exit(1);
} }
@ -199,11 +205,14 @@ namespace OpenSim
{ {
// The grid server has told us who we are // The grid server has told us who we are
// We must obey the grid server. // We must obey the grid server.
try { try
{
regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString()); regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString()); regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString(); regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
} catch(Exception e) { }
catch (Exception e)
{
m_console.WriteLine(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!"); m_console.WriteLine(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!");
Environment.Exit(1); Environment.Exit(1);
} }
@ -363,39 +372,33 @@ namespace OpenSim
// SandBoxMode // SandBoxMode
string attri = ""; string attri = "";
attri = configData.GetAttribute("SandBox"); attri = configData.GetAttribute("SandBox");
if ((attri == "")^(attri == "false")) if ((attri == "") || ((attri != "false") && (attri != "true")))
{ {
this.m_sandbox = false; this.m_sandbox = false;
configData.SetAttribute("SandBox", "false"); configData.SetAttribute("SandBox", "false");
} }
else if (attri == "true") else
{ {
this.m_sandbox = Convert.ToBoolean(attri); this.m_sandbox = Convert.ToBoolean(attri);
} else {
m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for SandBox attribute, terminating");
Environment.Exit(1);
} }
// LoginServer // LoginServer
attri = ""; attri = "";
attri = configData.GetAttribute("LoginServer"); attri = configData.GetAttribute("LoginServer");
if ((attri == "")^(attri == "false")) if ((attri == "") || ((attri != "false") && (attri != "true")))
{ {
this.m_loginserver = false; this.m_loginserver = false;
configData.SetAttribute("LoginServer", "false"); configData.SetAttribute("LoginServer", "false");
} }
else if (attri == "true") else
{ {
this.m_loginserver = Convert.ToBoolean(attri); this.m_loginserver = Convert.ToBoolean(attri);
} else {
m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for LoginServer attribute, terminating");
Environment.Exit(1);
} }
// Sandbox User accounts // Sandbox User accounts
attri = ""; attri = "";
attri = configData.GetAttribute("UserAccount"); attri = configData.GetAttribute("UserAccount");
if ((attri == "")^(attri == "false")) if ((attri == "") || ((attri != "false") && (attri != "true")))
{ {
this.user_accounts = false; this.user_accounts = false;
configData.SetAttribute("UserAccounts", "false"); configData.SetAttribute("UserAccounts", "false");
@ -403,15 +406,12 @@ namespace OpenSim
else if (attri == "true") else if (attri == "true")
{ {
this.user_accounts = Convert.ToBoolean(attri); this.user_accounts = Convert.ToBoolean(attri);
} else {
m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for UserAccount attribute, terminating");
Environment.Exit(1);
} }
// Grid mode hack to use local asset server // Grid mode hack to use local asset server
attri = ""; attri = "";
attri = configData.GetAttribute("LocalAssets"); attri = configData.GetAttribute("LocalAssets");
if ((attri == "")^(attri == "false")) if ((attri == "") || ((attri != "false") && (attri != "true")))
{ {
this.gridLocalAsset = false; this.gridLocalAsset = false;
configData.SetAttribute("LocalAssets", "false"); configData.SetAttribute("LocalAssets", "false");
@ -419,14 +419,13 @@ namespace OpenSim
else if (attri == "true") else if (attri == "true")
{ {
this.gridLocalAsset = Convert.ToBoolean(attri); this.gridLocalAsset = Convert.ToBoolean(attri);
} else {
m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for LocalAssets attribute, terminating");
} }
attri = ""; attri = "";
attri = configData.GetAttribute("PhysicsEngine"); attri = configData.GetAttribute("PhysicsEngine");
switch(attri) { switch (attri)
{
default: default:
m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating"); m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
Environment.Exit(1); Environment.Exit(1);
@ -438,6 +437,12 @@ namespace OpenSim
OpenSim.world.Avatar.PhysicsEngineFlying = false; OpenSim.world.Avatar.PhysicsEngineFlying = false;
break; break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
OpenSim.world.Avatar.PhysicsEngineFlying = false;
break;
case "RealPhysX": case "RealPhysX":
this.m_physicsEngine = "RealPhysX"; this.m_physicsEngine = "RealPhysX";
OpenSim.world.Avatar.PhysicsEngineFlying = true; OpenSim.world.Avatar.PhysicsEngineFlying = true;
@ -462,7 +467,8 @@ namespace OpenSim
private SimConfig LoadConfigDll(string dllName) private SimConfig LoadConfigDll(string dllName)
{ {
try { try
{
Assembly pluginAssembly = Assembly.LoadFrom(dllName); Assembly pluginAssembly = Assembly.LoadFrom(dllName);
SimConfig config = null; SimConfig config = null;
@ -487,7 +493,9 @@ namespace OpenSim
} }
pluginAssembly = null; pluginAssembly = null;
return config; return config;
} catch (Exception e) { }
catch (Exception e)
{
m_console.WriteLine(e.Message + "\nSorry, a fatal error occurred while trying to load the config DLL"); m_console.WriteLine(e.Message + "\nSorry, a fatal error occurred while trying to load the config DLL");
m_console.WriteLine("Can not continue starting up"); m_console.WriteLine("Can not continue starting up");
Environment.Exit(1); Environment.Exit(1);