aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712007-03-27 21:42:14 +0000
committerlbsa712007-03-27 21:42:14 +0000
commitf42d1fc825b7b9d22ae05836992531d9abd2a26d (patch)
treec316d0d2ec56a34c6c7f2099977bcc6f14e5eb24 /OpenSim
parent* Reverting todays work. It was worth a try. (diff)
downloadopensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.zip
opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.tar.gz
opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.tar.bz2
opensim-SC_OLD-f42d1fc825b7b9d22ae05836992531d9abd2a26d.tar.xz
* revert the revert - begin the beguine
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.csproj10
-rw-r--r--OpenSim/OpenSim.exe.build8
-rw-r--r--OpenSim/RegionServer.cs10
3 files changed, 14 insertions, 14 deletions
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 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}</ProjectGuid> 6 <ProjectGuid>{8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -82,25 +82,25 @@
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
85 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project> 85 <Project>{BD7866A4-04BA-47F0-905F-B2359118F5B2}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 87 <Private>False</Private>
88 </ProjectReference> 88 </ProjectReference>
89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project> 91 <Project>{4B0A7290-36C2-4C74-B9B4-07775B031CF2}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name> 96 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project> 97 <Project>{2EAB18A1-8187-4C79-9947-A671F9C007D9}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 99 <Private>False</Private>
100 </ProjectReference> 100 </ProjectReference>
101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
102 <Name>OpenSim.RegionServer</Name> 102 <Name>OpenSim.RegionServer</Name>
103 <Project>{4171D545-81F5-4C64-AD29-6D7414C38181}</Project> 103 <Project>{ADD974E2-994C-4998-864E-4B54D8AD5F00}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 105 <Private>False</Private>
106 </ProjectReference> 106 </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 @@
23 <include name="../bin/libsecondlife.dll" /> 23 <include name="../bin/libsecondlife.dll" />
24 <include name="../bin/Axiom.MathLib.dll" /> 24 <include name="../bin/Axiom.MathLib.dll" />
25 <include name="../bin/Db4objects.Db4o.dll" /> 25 <include name="../bin/Db4objects.Db4o.dll" />
26 <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> 28 <include name="../bin/OpenSim.Physics.Manager.dll" />
29 <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" /> 29 <include name="../bin/OpenSim.RegionServer.dll" />
30 </references> 30 </references>
31 </csc> 31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 32 <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;
7namespace OpenSim 7namespace OpenSim
8{ 8{
9 public class RegionServer : OpenSimMain 9 public class RegionServer : OpenSimMain
10 { 10 {
11 [STAThread] 11 [STAThread]
12 public static void Main(string[] args) 12 public static void Main(string[] args)
13 { 13 {
@@ -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); 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();