From f42d1fc825b7b9d22ae05836992531d9abd2a26d Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 27 Mar 2007 21:42:14 +0000
Subject: * revert the revert - begin the beguine
---
OpenSim/OpenSim.csproj | 10 +++++-----
OpenSim/OpenSim.exe.build | 8 ++++----
OpenSim/RegionServer.cs | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index bf57515..8e0d263 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}</ProjectGuid>
+ <ProjectGuid>{8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon>
@@ -82,25 +82,25 @@
<ItemGroup>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name>
- <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
+ <Project>{BD7866A4-04BA-47F0-905F-B2359118F5B2}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name>
- <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
+ <Project>{4B0A7290-36C2-4C74-B9B4-07775B031CF2}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name>
- <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
+ <Project>{2EAB18A1-8187-4C79-9947-A671F9C007D9}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
<Name>OpenSim.RegionServer</Name>
- <Project>{4171D545-81F5-4C64-AD29-6D7414C38181}</Project>
+ <Project>{ADD974E2-994C-4998-864E-4B54D8AD5F00}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 7d69d90..613f527 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -23,10 +23,10 @@
<include name="../bin/libsecondlife.dll" />
<include name="../bin/Axiom.MathLib.dll" />
<include name="../bin/Db4objects.Db4o.dll" />
- <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
- <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
- <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
- <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
+ <include name="../bin/OpenSim.Framework.dll" />
+ <include name="../bin/OpenSim.Framework.Console.dll" />
+ <include name="../bin/OpenSim.Physics.Manager.dll" />
+ <include name="../bin/OpenSim.RegionServer.dll" />
</references>
</csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index 3612d49..a0037b1 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -7,7 +7,7 @@ using OpenSim.Framework.Console;
namespace OpenSim
{
public class RegionServer : OpenSimMain
- {
+ {
[STAThread]
public static void Main(string[] args)
{
@@ -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);
+ 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();
--
cgit v1.1