* Config should be loaded before login server startup...

author: lbsa71 2007-03-27 20:33:02 +0000
committer: lbsa71 2007-03-27 20:33:02 +0000
commit: 64aa87765b1e215fd8cc7c81d35b70a4c4bd8721 (patch)
tree: 3a58d1156aa0e0a55f59c2ea95ec3ec5f65f9c21
parent: * vaseline + duct-tape. (diff)
download: opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.zip
opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.gz
opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.bz2
opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.xz
2 files changed, 72 insertions, 95 deletions
diff --git a/OpenSim.sln b/OpenSim.sln
index c041637..39c63f6 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -31,96 +31,73 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{70E89693-4AEF-4EA1-8306-D0EBED065AC8}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
+                Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
+                Release|Any CPU = Release|Any CPU
-  EndGlobalSection
+        EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    ({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({FC8E9647-4292-49BC-810F-EAEEBF82396B}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({FC8E9647-4292-49BC-810F-EAEEBF82396B}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({4A7265F1-134B-4895-A33C-E9A3F84C6C08}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})
+                {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})
+                {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})
+                {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).8 = ({72B438C6-38C5-4620-AC4C-E15BA326FF51})
+                {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})
+                {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).8 = ({8038EFDC-3245-4EA1-B198-0DA1E724D7A1})
+                {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({12107D41-F2F9-4D49-835E-89D79D12DA8D}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8})
+                {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({12107D41-F2F9-4D49-835E-89D79D12DA8D}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})
+                {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({70E89693-4AEF-4EA1-8306-D0EBED065AC8}).3 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})
+                {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  EndGlobalSection
+                {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.Build.0 = Release|Any CPU
-    {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.Build.0 = Release|Any CPU
-    {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.Build.0 = Release|Any CPU
+                {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.Build.0 = Release|Any CPU
-    {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.Build.0 = Release|Any CPU
-    {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.Build.0 = Release|Any CPU
+                {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.Build.0 = Release|Any CPU
-    {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.Build.0 = Release|Any CPU
+                {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.Build.0 = Release|Any CPU
+                {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        EndGlobalSection
-    {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        GlobalSection(SolutionProperties) = preSolution
-    {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.Build.0 = Release|Any CPU
+                HideSolutionNode = FALSE
-    {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        EndGlobalSection
-    {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.Build.0 = Release|Any CPU
-    {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.Build.0 = Release|Any CPU
-    {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.Build.0 = Release|Any CPU
-    {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.Build.0 = Release|Any CPU
-    {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index 180bdbd..a0037b1 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -63,14 +63,14 @@ namespace OpenSim
                OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");
            }
+            OpenSimRoot.Instance.StartUp();
            if (sim.loginserver && sim.sandbox)
            {
                LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort);
                loginServer.Startup();
            }
+            
-            OpenSimRoot.Instance.StartUp();
            while (true)
            {
                OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
author	lbsa71	2007-03-27 20:33:02 +0000
committer	lbsa71	2007-03-27 20:33:02 +0000
commit	64aa87765b1e215fd8cc7c81d35b70a4c4bd8721 (patch)
tree	3a58d1156aa0e0a55f59c2ea95ec3ec5f65f9c21
parent	* vaseline + duct-tape. (diff)
download	opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.zip opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.gz opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.bz2 opensim-SC_OLD-64aa87765b1e215fd8cc7c81d35b70a4c4bd8721.tar.xz

diff --git a/OpenSim.sln b/OpenSim.sln index c041637..39c63f6 100644 --- a/OpenSim.sln +++ b/OpenSim.sln
@@ -31,96 +31,73 @@ EndProject
31	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{70E89693-4AEF-4EA1-8306-D0EBED065AC8}"	31	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{70E89693-4AEF-4EA1-8306-D0EBED065AC8}"
32	EndProject	32	EndProject
33	Global	33	Global
34	GlobalSection(SolutionConfigurationPlatforms) = preSolution	34	GlobalSection(SolutionConfigurationPlatforms) = preSolution
35	Debug\|Any CPU = Debug\|Any CPU	35	Debug\|Any CPU = Debug\|Any CPU
36	Release\|Any CPU = Release\|Any CPU	36	Release\|Any CPU = Release\|Any CPU
37	EndGlobalSection	37	EndGlobalSection
38	GlobalSection(ProjectDependencies) = postSolution	38	GlobalSection(ProjectConfigurationPlatforms) = postSolution
39	({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8})	39	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
40	({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	40	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
41	({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8})	41	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
42	({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	42	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release\|Any CPU.Build.0 = Release\|Any CPU
43	({FC8E9647-4292-49BC-810F-EAEEBF82396B}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8})	43	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
44	({FC8E9647-4292-49BC-810F-EAEEBF82396B}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	44	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
45	({4A7265F1-134B-4895-A33C-E9A3F84C6C08}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})	45	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
46	({E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})	46	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release\|Any CPU.Build.0 = Release\|Any CPU
47	({974744D2-C043-42F8-BEE0-DABFD4A294E9}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8})	47	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
48	({974744D2-C043-42F8-BEE0-DABFD4A294E9}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	48	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
49	({974744D2-C043-42F8-BEE0-DABFD4A294E9}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})	49	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
50	({974744D2-C043-42F8-BEE0-DABFD4A294E9}).8 = ({72B438C6-38C5-4620-AC4C-E15BA326FF51})	50	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release\|Any CPU.Build.0 = Release\|Any CPU
51	({72B438C6-38C5-4620-AC4C-E15BA326FF51}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8})	51	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
52	({72B438C6-38C5-4620-AC4C-E15BA326FF51}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	52	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
53	({72B438C6-38C5-4620-AC4C-E15BA326FF51}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})	53	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
54	({72B438C6-38C5-4620-AC4C-E15BA326FF51}).8 = ({8038EFDC-3245-4EA1-B198-0DA1E724D7A1})	54	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release\|Any CPU.Build.0 = Release\|Any CPU
55	({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8})	55	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
56	({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	56	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
57	({12107D41-F2F9-4D49-835E-89D79D12DA8D}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8})	57	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
58	({12107D41-F2F9-4D49-835E-89D79D12DA8D}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822})	58	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release\|Any CPU.Build.0 = Release\|Any CPU
59	({70E89693-4AEF-4EA1-8306-D0EBED065AC8}).3 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09})	59	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
60	EndGlobalSection	60	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
61	GlobalSection(ProjectConfigurationPlatforms) = postSolution	61	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
62	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	62	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release\|Any CPU.Build.0 = Release\|Any CPU
63	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	63	{E1171263-9131-454C-B0A6-2374D98714A8}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
64	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	64	{E1171263-9131-454C-B0A6-2374D98714A8}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
65	{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release\|Any CPU.Build.0 = Release\|Any CPU	65	{E1171263-9131-454C-B0A6-2374D98714A8}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
66	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	66	{E1171263-9131-454C-B0A6-2374D98714A8}.Release\|Any CPU.Build.0 = Release\|Any CPU
67	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	67	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
68	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	68	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
69	{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release\|Any CPU.Build.0 = Release\|Any CPU	69	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
70	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	70	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release\|Any CPU.Build.0 = Release\|Any CPU
71	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	71	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
72	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	72	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
73	{87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release\|Any CPU.Build.0 = Release\|Any CPU	73	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
74	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	74	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release\|Any CPU.Build.0 = Release\|Any CPU
75	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	75	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
76	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	76	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
77	{F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release\|Any CPU.Build.0 = Release\|Any CPU	77	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
78	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	78	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release\|Any CPU.Build.0 = Release\|Any CPU
79	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	79	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
80	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	80	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
81	{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release\|Any CPU.Build.0 = Release\|Any CPU	81	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
82	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	82	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release\|Any CPU.Build.0 = Release\|Any CPU
83	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	83	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
84	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	84	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
85	{FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release\|Any CPU.Build.0 = Release\|Any CPU	85	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
86	{E1171263-9131-454C-B0A6-2374D98714A8}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	86	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release\|Any CPU.Build.0 = Release\|Any CPU
87	{E1171263-9131-454C-B0A6-2374D98714A8}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	87	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
88	{E1171263-9131-454C-B0A6-2374D98714A8}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	88	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
89	{E1171263-9131-454C-B0A6-2374D98714A8}.Release\|Any CPU.Build.0 = Release\|Any CPU	89	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
90	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	90	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release\|Any CPU.Build.0 = Release\|Any CPU
91	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	91	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
92	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	92	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
93	{01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release\|Any CPU.Build.0 = Release\|Any CPU	93	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
94	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	94	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release\|Any CPU.Build.0 = Release\|Any CPU
95	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	95	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
96	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	96	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
97	{4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release\|Any CPU.Build.0 = Release\|Any CPU	97	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
98	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	98	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release\|Any CPU.Build.0 = Release\|Any CPU
99	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	99	EndGlobalSection
100	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	100	GlobalSection(SolutionProperties) = preSolution
101	{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release\|Any CPU.Build.0 = Release\|Any CPU	101	HideSolutionNode = FALSE
102	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	102	EndGlobalSection
103	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
104	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
105	{974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release\|Any CPU.Build.0 = Release\|Any CPU
106	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
107	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
108	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
109	{72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release\|Any CPU.Build.0 = Release\|Any CPU
110	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
111	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
112	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
113	{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release\|Any CPU.Build.0 = Release\|Any CPU
114	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
115	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
116	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
117	{12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release\|Any CPU.Build.0 = Release\|Any CPU
118	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
119	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
120	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
121	{70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release\|Any CPU.Build.0 = Release\|Any CPU
122	EndGlobalSection
123	GlobalSection(SolutionProperties) = preSolution
124	HideSolutionNode = FALSE
125	EndGlobalSection
126	EndGlobal	103	EndGlobal


diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs index 180bdbd..a0037b1 100644 --- a/OpenSim/RegionServer.cs +++ b/OpenSim/RegionServer.cs
@@ -63,14 +63,14 @@ namespace OpenSim
63	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");	63	OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");
64	}	64	}
65		65
		66	OpenSimRoot.Instance.StartUp();
		67
66	if (sim.loginserver && sim.sandbox)	68	if (sim.loginserver && sim.sandbox)
67	{	69	{
68	LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort);	70	LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenAddr, OpenSimRoot.Instance.Cfg.IPListenPort);
69	loginServer.Startup();	71	loginServer.Startup();
70	}	72	}
71		73
72	OpenSimRoot.Instance.StartUp();
73
74	while (true)	74	while (true)
75	{	75	{
76	OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();	76	OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();