Some work on restructuring the namespaces / project names. Note this doesn't compile yet as not all the code has been changed to use the new namespaces. Am committing it now for feedback on the namespaces.

author: MW 2007-06-27 15:28:52 +0000
committer: MW 2007-06-27 15:28:52 +0000
commit: 646bbbc84b8010e0dacbeed5342cdb045f46cc49 (patch)
tree: 770b34d19855363c3c113ab9a0af9a56d821d887 /OpenSim/Region/Application/Application.cs
download: opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.zip
opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.gz
opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.bz2
opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.xz
1 files changed, 121 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
new file mode 100644
index 0000000..40701b0
--- /dev/null
+++ b/OpenSim/Region/Application/Application.cs
@@ -0,0 +1,121 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Console;
+namespace OpenSim
+{
+    public class Application
+    {   
+        //could move our main function into OpenSimMain and kill this class
+        [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;
+            bool gridLocalAsset = false;
+            bool useConfigFile = false;
+            bool silent = false;
+            string configFile = "simconfig.xml";
+            
+            for (int i = 0; i < args.Length; i++)
+            {
+                if (args[i] == "-sandbox")
+                {
+                    sandBoxMode = true;
+                    startLoginServer = 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;
+                }
+                if (args[i] == "-localasset")
+                {
+                    gridLocalAsset = true;
+                }
+                if (args[i] == "-configfile")
+                {
+                    useConfigFile = true;
+                }
+                if (args[i] == "-noverbose")
+                {
+                    silent = true;
+                }
+                if (args[i] == "-config")
+                {
+                    try
+                    {
+                        i++;
+                        configFile = args[i];
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
+                    }
+                }
+            }
+            OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
+           // OpenSimRoot.Instance.Application = sim;
+            sim.m_sandbox = sandBoxMode;
+            sim.user_accounts = userAccounts;
+            sim.gridLocalAsset = gridLocalAsset;
+            OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
+            sim.StartUp();
+            while (true)
+            {
+                OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
+            }
+        }
+    }
+}
author	MW	2007-06-27 15:28:52 +0000
committer	MW	2007-06-27 15:28:52 +0000
commit	646bbbc84b8010e0dacbeed5342cdb045f46cc49 (patch)
tree	770b34d19855363c3c113ab9a0af9a56d821d887 /OpenSim/Region/Application/Application.cs
download	opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.zip opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.gz opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.bz2 opensim-SC_OLD-646bbbc84b8010e0dacbeed5342cdb045f46cc49.tar.xz

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs new file mode 100644 index 0000000..40701b0 --- /dev/null +++ b/OpenSim/Region/Application/Application.cs
@@ -0,0 +1,121 @@
	1	/*
	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions are met:
	7	* * Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* * Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	* * Neither the name of the OpenSim Project nor the
	13	* names of its contributors may be used to endorse or promote products
	14	* derived from this software without specific prior written permission.
	15	*
	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	26	*
	27	*/
	28	using System;
	29	using System.Collections.Generic;
	30	using System.Text;
	31	using OpenSim.Framework.Console;
	32
	33	namespace OpenSim
	34	{
	35	public class Application
	36	{
	37	//could move our main function into OpenSimMain and kill this class
	38	[STAThread]
	39	public static void Main(string[] args)
	40	{
	41	Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
	42	Console.WriteLine("Starting...\n");
	43
	44	bool sandBoxMode = false;
	45	bool startLoginServer = false;
	46	string physicsEngine = "basicphysics";
	47	bool allowFlying = false;
	48	bool userAccounts = false;
	49	bool gridLocalAsset = false;
	50	bool useConfigFile = false;
	51	bool silent = false;
	52	string configFile = "simconfig.xml";
	53
	54	for (int i = 0; i < args.Length; i++)
	55	{
	56	if (args[i] == "-sandbox")
	57	{
	58	sandBoxMode = true;
	59	startLoginServer = true;
	60	}
	61	/*
	62	if (args[i] == "-loginserver")
	63	{
	64	startLoginServer = true;
	65	}*/
	66	if (args[i] == "-accounts")
	67	{
	68	userAccounts = true;
	69	}
	70	if (args[i] == "-realphysx")
	71	{
	72	physicsEngine = "RealPhysX";
	73	allowFlying = true;
	74	}
	75	if (args[i] == "-ode")
	76	{
	77	physicsEngine = "OpenDynamicsEngine";
	78	allowFlying = true;
	79	}
	80	if (args[i] == "-localasset")
	81	{
	82	gridLocalAsset = true;
	83	}
	84	if (args[i] == "-configfile")
	85	{
	86	useConfigFile = true;
	87	}
	88	if (args[i] == "-noverbose")
	89	{
	90	silent = true;
	91	}
	92	if (args[i] == "-config")
	93	{
	94	try
	95	{
	96	i++;
	97	configFile = args[i];
	98	}
	99	catch (Exception e)
	100	{
	101	Console.WriteLine("-config: Please specify a config file. (" + e.ToString() + ")");
	102	}
	103	}
	104	}
	105
	106	OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
	107	// OpenSimRoot.Instance.Application = sim;
	108	sim.m_sandbox = sandBoxMode;
	109	sim.user_accounts = userAccounts;
	110	sim.gridLocalAsset = gridLocalAsset;
	111	OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying;
	112
	113	sim.StartUp();
	114
	115	while (true)
	116	{
	117	OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
	118	}
	119	}
	120	}
	121	}