aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-04-17 13:39:21 +0000
committerMW2007-04-17 13:39:21 +0000
commit631d30b80dbffd786df64155510d01b0c0cb6da2 (patch)
tree3f18c6136d37e3cb6f63c36eb642686c079a9ee9
parentHopefully undid the murder I committed in the last commit (diff)
downloadopensim-SC_OLD-631d30b80dbffd786df64155510d01b0c0cb6da2.zip
opensim-SC_OLD-631d30b80dbffd786df64155510d01b0c0cb6da2.tar.gz
opensim-SC_OLD-631d30b80dbffd786df64155510d01b0c0cb6da2.tar.bz2
opensim-SC_OLD-631d30b80dbffd786df64155510d01b0c0cb6da2.tar.xz
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)
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs10
-rw-r--r--OpenSim.RegionServer/SimClient.cs1
-rw-r--r--OpenSim/Application.cs6
3 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index ea6088b..48eff1b 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -83,6 +83,7 @@ namespace OpenSim
83 public bool m_sandbox = false; 83 public bool m_sandbox = false;
84 public bool m_loginserver; 84 public bool m_loginserver;
85 public bool user_accounts = false; 85 public bool user_accounts = false;
86 public bool gridLocalAsset = false;
86 87
87 protected ConsoleBase m_console; 88 protected ConsoleBase m_console;
88 89
@@ -126,7 +127,14 @@ namespace OpenSim
126 } 127 }
127 else 128 else
128 { 129 {
129 GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll"; 130 if (this.gridLocalAsset)
131 {
132 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
133 }
134 else
135 {
136 GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
137 }
130 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; 138 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
131 139
132 m_console.WriteLine("Starting in Grid mode"); 140 m_console.WriteLine("Starting in Grid mode");
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 0c90dcb..cc85b67 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -201,7 +201,6 @@ namespace OpenSim
201 NewSimPack.Info.LookAt = new LLVector3(0.99f, 0.042f, 0); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! 201 NewSimPack.Info.LookAt = new LLVector3(0.99f, 0.042f, 0); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
202 NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock(); 202 NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
203 NewSimPack.RegionData.RegionHandle = Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256)); 203 NewSimPack.RegionData.RegionHandle = Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256));
204
205 System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]); 204 System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]);
206 byte[] byteIP = neighbourIP.GetAddressBytes(); 205 byte[] byteIP = neighbourIP.GetAddressBytes();
207 NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24; 206 NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs
index 34dbf8e..0e3d5a6 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim/Application.cs
@@ -19,6 +19,7 @@ namespace OpenSim
19 string physicsEngine = "basicphysics"; 19 string physicsEngine = "basicphysics";
20 bool allowFlying = false; 20 bool allowFlying = false;
21 bool userAccounts = false; 21 bool userAccounts = false;
22 bool gridLocalAsset = false;
22 23
23 for (int i = 0; i < args.Length; i++) 24 for (int i = 0; i < args.Length; i++)
24 { 25 {
@@ -45,12 +46,17 @@ namespace OpenSim
45 physicsEngine = "OpenDynamicsEngine"; 46 physicsEngine = "OpenDynamicsEngine";
46 allowFlying = true; 47 allowFlying = true;
47 } 48 }
49 if (args[i] == "-localasset")
50 {
51 gridLocalAsset = true;
52 }
48 } 53 }
49 54
50 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine ); 55 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
51 // OpenSimRoot.Instance.Application = sim; 56 // OpenSimRoot.Instance.Application = sim;
52 sim.m_sandbox = sandBoxMode; 57 sim.m_sandbox = sandBoxMode;
53 sim.user_accounts = userAccounts; 58 sim.user_accounts = userAccounts;
59 sim.gridLocalAsset = gridLocalAsset;
54 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying; 60 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
55 61
56 sim.StartUp(); 62 sim.StartUp();