diff --git a/OpenSim.sln b/OpenSim.sln index c041637bb0..39c63f650b 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 - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - ({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({FC8E9647-4292-49BC-810F-EAEEBF82396B}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({FC8E9647-4292-49BC-810F-EAEEBF82396B}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({4A7265F1-134B-4895-A33C-E9A3F84C6C08}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) - ({E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) - ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) - ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).8 = ({72B438C6-38C5-4620-AC4C-E15BA326FF51}) - ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) - ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).8 = ({8038EFDC-3245-4EA1-B198-0DA1E724D7A1}) - ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({12107D41-F2F9-4D49-835E-89D79D12DA8D}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8}) - ({12107D41-F2F9-4D49-835E-89D79D12DA8D}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) - ({70E89693-4AEF-4EA1-8306-D0EBED065AC8}).3 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.Build.0 = Release|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.Build.0 = Release|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.Build.0 = Release|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.Build.0 = Release|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.Build.0 = Release|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.Build.0 = Release|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.Build.0 = Release|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.Build.0 = Release|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.Build.0 = Release|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.Build.0 = Release|Any CPU - {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.Build.0 = Release|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.Build.0 = Release|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.Build.0 = Release|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.Build.0 = Release|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.Build.0 = Release|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.Build.0 = Release|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.Build.0 = Release|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.Build.0 = Release|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.Build.0 = Release|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.Build.0 = Release|Any CPU + {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 180bdbde75..a0037b18c0 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();