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

Yet another command line option (really need to get all these moved into a config file), this one: "-localasset" (without the quotes) is a temporary hack to use a local asset server when in grid mode. (use with extreme caution if you have more than one sim in a grid)

0.1-prestable
MW 2007-04-17 13:39:21 +00:00
parent 2180bdf64a
commit 631d30b80d
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -83,6 +83,7 @@ namespace OpenSim
public bool m_sandbox = false; public bool m_sandbox = false;
public bool m_loginserver; public bool m_loginserver;
public bool user_accounts = false; public bool user_accounts = false;
public bool gridLocalAsset = false;
protected ConsoleBase m_console; protected ConsoleBase m_console;
@ -125,8 +126,15 @@ namespace OpenSim
m_console.WriteLine("Starting in Sandbox mode"); m_console.WriteLine("Starting in Sandbox mode");
} }
else else
{
if (this.gridLocalAsset)
{
GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
}
else
{ {
GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll"; GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
}
GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
m_console.WriteLine("Starting in Grid mode"); m_console.WriteLine("Starting in Grid mode");

1
OpenSim.RegionServer/SimClient.cs
View File

@ -201,7 +201,6 @@ namespace OpenSim
NewSimPack.Info.LookAt = new LLVector3(0.99f, 0.042f, 0); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! NewSimPack.Info.LookAt = new LLVector3(0.99f, 0.042f, 0); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock(); NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
NewSimPack.RegionData.RegionHandle = Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256)); NewSimPack.RegionData.RegionHandle = Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256));
System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]); System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]);
byte[] byteIP = neighbourIP.GetAddressBytes(); byte[] byteIP = neighbourIP.GetAddressBytes();
NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24; NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;

6
OpenSim/Application.cs
View File

@ -19,6 +19,7 @@ namespace OpenSim
string physicsEngine = "basicphysics"; string physicsEngine = "basicphysics";
bool allowFlying = false; bool allowFlying = false;
bool userAccounts = false; bool userAccounts = false;
bool gridLocalAsset = false;
for (int i = 0; i < args.Length; i++) for (int i = 0; i < args.Length; i++)
{ {
@ -45,12 +46,17 @@ namespace OpenSim
physicsEngine = "OpenDynamicsEngine"; physicsEngine = "OpenDynamicsEngine";
allowFlying = true; allowFlying = true;
} }
if (args[i] == "-localasset")
{
gridLocalAsset = true;
}
} }
OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
// OpenSimRoot.Instance.Application = sim; // OpenSimRoot.Instance.Application = sim;
sim.m_sandbox = sandBoxMode; sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts; sim.user_accounts = userAccounts;
sim.gridLocalAsset = gridLocalAsset;
OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
sim.StartUp(); sim.StartUp();