From d9ca66141629105c0b5c924aa51ebfcc2ebd5dc8 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 3 Apr 2007 20:31:46 +0000
Subject: * Fixad namespace clash

---
 OpenSim/Application.cs    | 64 +++++++++++++++++++++++++++++++++++++++++++++++
 OpenSim/OpenSim.csproj    |  3 +++
 OpenSim/OpenSim.exe.build |  1 +
 OpenSim/RegionServer.cs   | 64 -----------------------------------------------
 4 files changed, 68 insertions(+), 64 deletions(-)
 create mode 100644 OpenSim/Application.cs

(limited to 'OpenSim')

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 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.UserServer;
+using OpenSim.Framework.Console;
+
+namespace OpenSim
+{
+    public class Application
+    {        
+        [STAThread]
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
+            Console.WriteLine("Starting...\n");
+            
+            bool sandBoxMode = false;
+            bool startLoginServer = false;
+            string physicsEngine = "basicphysics";
+            bool allowFlying = false;
+            bool userAccounts = false;
+            
+            for (int i = 0; i < args.Length; i++)
+            {
+                if (args[i] == "-sandbox")
+                {
+                    sandBoxMode = true;
+                }
+
+                if (args[i] == "-loginserver")
+                {
+                    startLoginServer = true;
+                }
+                if (args[i] == "-accounts")
+                {
+                    userAccounts = true;
+                }
+                if (args[i] == "-realphysx")
+                {
+                    physicsEngine = "RealPhysX";
+                    allowFlying = true;
+                }
+                if (args[i] == "-ode")
+                {
+                    physicsEngine = "OpenDynamicsEngine";
+                    allowFlying = true;
+                }
+            }
+
+            OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
+           // OpenSimRoot.Instance.Application = sim;
+            sim.m_sandbox = sandBoxMode;
+            sim.user_accounts = userAccounts;
+            OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
+
+            sim.StartUp();
+
+            while (true)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
+            }
+        }
+    }
+}
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 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Application.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RegionServer.cs">
       <SubType>Code</SubType>
     </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 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="Application.cs" />
                 <include name="RegionServer.cs" />
             </sources>
             <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 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.UserServer;
-using OpenSim.Framework.Console;
-
-namespace OpenSim
-{
-    public class RegionServer
-    {        
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
-            Console.WriteLine("Starting...\n");
-            
-            bool sandBoxMode = false;
-            bool startLoginServer = false;
-            string physicsEngine = "basicphysics";
-            bool allowFlying = false;
-            bool userAccounts = false;
-            
-            for (int i = 0; i < args.Length; i++)
-            {
-                if (args[i] == "-sandbox")
-                {
-                    sandBoxMode = true;
-                }
-
-                if (args[i] == "-loginserver")
-                {
-                    startLoginServer = true;
-                }
-                if (args[i] == "-accounts")
-                {
-                    userAccounts = true;
-                }
-                if (args[i] == "-realphysx")
-                {
-                    physicsEngine = "RealPhysX";
-                    allowFlying = true;
-                }
-                if (args[i] == "-ode")
-                {
-                    physicsEngine = "OpenDynamicsEngine";
-                    allowFlying = true;
-                }
-            }
-
-            OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
-           // OpenSimRoot.Instance.Application = sim;
-            sim.m_sandbox = sandBoxMode;
-            sim.user_accounts = userAccounts;
-            OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
-
-            sim.StartUp();
-
-            while (true)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
-            }
-        }
-    }
-}
-- 
cgit v1.1