aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-04-03 20:31:46 +0000
committerlbsa712007-04-03 20:31:46 +0000
commitd9ca66141629105c0b5c924aa51ebfcc2ebd5dc8 (patch)
tree79620e35ed07734271cf82cec172b3bd3c0e512f /OpenSim
parent* The world can not contain ScriptFactories that creates unique instances of ... (diff)
downloadopensim-SC_OLD-d9ca66141629105c0b5c924aa51ebfcc2ebd5dc8.zip
opensim-SC_OLD-d9ca66141629105c0b5c924aa51ebfcc2ebd5dc8.tar.gz
opensim-SC_OLD-d9ca66141629105c0b5c924aa51ebfcc2ebd5dc8.tar.bz2
opensim-SC_OLD-d9ca66141629105c0b5c924aa51ebfcc2ebd5dc8.tar.xz
* Fixad namespace clash
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Application.cs64
-rw-r--r--OpenSim/OpenSim.csproj3
-rw-r--r--OpenSim/OpenSim.exe.build1
-rw-r--r--OpenSim/RegionServer.cs64
4 files changed, 68 insertions, 64 deletions
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs
new file mode 100644
index 0000000..34dbf8e
--- /dev/null
+++ b/OpenSim/Application.cs
@@ -0,0 +1,64 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.UserServer;
5using OpenSim.Framework.Console;
6
7namespace OpenSim
8{
9 public class Application
10 {
11 [STAThread]
12 public static void Main(string[] args)
13 {
14 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
15 Console.WriteLine("Starting...\n");
16
17 bool sandBoxMode = false;
18 bool startLoginServer = false;
19 string physicsEngine = "basicphysics";
20 bool allowFlying = false;
21 bool userAccounts = false;
22
23 for (int i = 0; i < args.Length; i++)
24 {
25 if (args[i] == "-sandbox")
26 {
27 sandBoxMode = true;
28 }
29
30 if (args[i] == "-loginserver")
31 {
32 startLoginServer = true;
33 }
34 if (args[i] == "-accounts")
35 {
36 userAccounts = true;
37 }
38 if (args[i] == "-realphysx")
39 {
40 physicsEngine = "RealPhysX";
41 allowFlying = true;
42 }
43 if (args[i] == "-ode")
44 {
45 physicsEngine = "OpenDynamicsEngine";
46 allowFlying = true;
47 }
48 }
49
50 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
51 // OpenSimRoot.Instance.Application = sim;
52 sim.m_sandbox = sandBoxMode;
53 sim.user_accounts = userAccounts;
54 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
55
56 sim.StartUp();
57
58 while (true)
59 {
60 OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
61 }
62 }
63 }
64}
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index f56206f..000d3e5 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -112,6 +112,9 @@
112 </ProjectReference> 112 </ProjectReference>
113 </ItemGroup> 113 </ItemGroup>
114 <ItemGroup> 114 <ItemGroup>
115 <Compile Include="Application.cs">
116 <SubType>Code</SubType>
117 </Compile>
115 <Compile Include="RegionServer.cs"> 118 <Compile Include="RegionServer.cs">
116 <SubType>Code</SubType> 119 <SubType>Code</SubType>
117 </Compile> 120 </Compile>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index deb4cfb..78124ae 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -11,6 +11,7 @@
11 <resources prefix="OpenSim" dynamicprefix="true" > 11 <resources prefix="OpenSim" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Application.cs" />
14 <include name="RegionServer.cs" /> 15 <include name="RegionServer.cs" />
15 </sources> 16 </sources>
16 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index 56813f5..e69de29 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -1,64 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.UserServer;
5using OpenSim.Framework.Console;
6
7namespace OpenSim
8{
9 public class RegionServer
10 {
11 [STAThread]
12 public static void Main(string[] args)
13 {
14 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
15 Console.WriteLine("Starting...\n");
16
17 bool sandBoxMode = false;
18 bool startLoginServer = false;
19 string physicsEngine = "basicphysics";
20 bool allowFlying = false;
21 bool userAccounts = false;
22
23 for (int i = 0; i < args.Length; i++)
24 {
25 if (args[i] == "-sandbox")
26 {
27 sandBoxMode = true;
28 }
29
30 if (args[i] == "-loginserver")
31 {
32 startLoginServer = true;
33 }
34 if (args[i] == "-accounts")
35 {
36 userAccounts = true;
37 }
38 if (args[i] == "-realphysx")
39 {
40 physicsEngine = "RealPhysX";
41 allowFlying = true;
42 }
43 if (args[i] == "-ode")
44 {
45 physicsEngine = "OpenDynamicsEngine";
46 allowFlying = true;
47 }
48 }
49
50 OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
51 // OpenSimRoot.Instance.Application = sim;
52 sim.m_sandbox = sandBoxMode;
53 sim.user_accounts = userAccounts;
54 OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
55
56 sim.StartUp();
57
58 while (true)
59 {
60 OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
61 }
62 }
63 }
64}