From 91c11314acbec75bfdfa878b69b02543629b2b17 Mon Sep 17 00:00:00 2001
From: jhurliman <jhurliman>
Date: Fri, 2 Mar 2007 08:36:57 +0000
Subject: [PATCH] * Bind to IPAddress.Any instead of a hardcoded address *
 Allow login if a connection can't be made to the grid auth server (instead of
 crashing) * Brought the MSVC project file and solution up to speed * Added a
 default VersionInfo.cs to allow compiling with MSVC * Removed unnecessary
 .suo file

---
 src/Main.cs              |   2 +-
 src/OpenSimClient.cs     |   2 +-
 src/Second-server.csproj |  36 ++++++++++++++++++++----------------
 src/Second-server.sln    |  14 +++-----------
 src/Second-server.suo    | Bin 27648 -> 0 bytes
 5 files changed, 25 insertions(+), 29 deletions(-)
 delete mode 100644 src/Second-server.suo

diff --git a/src/Main.cs b/src/Main.cs
index da926dbf89..6075035977 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -118,7 +118,7 @@ namespace OpenSim
 		Console.WriteLine("Main.cs:MainServerListener() - New thread started");
 		Console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + cfg.IPListenAddr + ":" + cfg.IPListenPort);
 
-		ServerIncoming = new IPEndPoint(IPAddress.Parse(cfg.IPListenAddr),cfg.IPListenPort);
+        ServerIncoming = new IPEndPoint(IPAddress.Any, cfg.IPListenPort);
 		Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
 		Server.Bind(ServerIncoming);
 		
diff --git a/src/OpenSimClient.cs b/src/OpenSimClient.cs
index 59833d858d..83d859941f 100644
--- a/src/OpenSimClient.cs
+++ b/src/OpenSimClient.cs
@@ -391,7 +391,7 @@ namespace OpenSim
 			String grTest = sr.ReadLine();
 			sr.Close();
 			GridResponse.Close();
-			if(grTest.Equals("1")) { 	// YAY! Valid login
+			if(String.IsNullOrEmpty(grTest) || grTest.Equals("1")) { 	// YAY! Valid login
 				Console.WriteLine("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
 				this.AgentID=cirpack.CircuitCode.ID;
 				this.SessionID=cirpack.CircuitCode.SessionID;
diff --git a/src/Second-server.csproj b/src/Second-server.csproj
index 6d049ce4f2..a4cd744c46 100644
--- a/src/Second-server.csproj
+++ b/src/Second-server.csproj
@@ -6,10 +6,10 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}</ProjectGuid>
-    <StartupObject>OpenSim.Controller</StartupObject>
+    <StartupObject>OpenSim.OpenSim_Main</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugSymbols>True</DebugSymbols>
@@ -17,7 +17,7 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <DebugSymbols>False</DebugSymbols>
@@ -29,6 +29,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
     </Reference>
+    <Reference Include="Db4objects.Db4o, Version=6.0.1.0, Culture=neutral, PublicKeyToken=6199cd4f203aa8eb, processorArchitecture=MSIL" />
     <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\bin\libsecondlife.dll</HintPath>
@@ -42,19 +43,22 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Agent_Manager.cs" />
-    <Compile Include="Controller.cs" />
-    <Compile Include="Prim_manager.cs" />
-    <Compile Include="Login_manager.cs" />
-    <Compile Include="Physics_manager.cs" />
-    <Compile Include="Script_manager.cs" />
-    <Compile Include="Server.cs" />
-    <Compile Include="StorageManager.cs" />
-    <Compile Include="GridManager.cs" />
-    <Compile Include="Globals.cs" />
-    <Compile Include="InventoryManager.cs" />
-    <Compile Include="SceneGraphManager.cs" />
-    <Compile Include="AssetManagement.cs" />
+    <Compile Include="Config.cs" />
+    <Compile Include="Main.cs" />
+    <Compile Include="OpenSimClient.cs" />
+    <Compile Include="types\BitPack.cs" />
+    <Compile Include="types\Mesh.cs" />
+    <Compile Include="types\Triangle.cs" />
+    <Compile Include="Util.cs" />
+    <Compile Include="VersionInfo.cs" />
+    <Compile Include="world\Avatar.cs" />
+    <Compile Include="world\Entity.cs" />
+    <Compile Include="world\Primitive.cs" />
+    <Compile Include="world\ScriptEngine.cs" />
+    <Compile Include="world\scripting\IScript.cs" />
+    <Compile Include="world\SurfacePatch.cs" />
+    <Compile Include="world\TerrainDecoder.cs" />
+    <Compile Include="world\World.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Second-server.sln b/src/Second-server.sln
index 44be1dbfbc..86fc54c313 100644
--- a/src/Second-server.sln
+++ b/src/Second-server.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.2017
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}"
 EndProject
 Global
@@ -12,21 +12,13 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU
+		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.Build.0 = Debug|Any CPU
 		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.ActiveCfg = Release|Any CPU
+		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
 		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|.NET 1.1.ActiveCfg = Debug|.NET 1.1
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|.NET 1.1.ActiveCfg = Release|.NET 1.1
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
-		{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/Second-server.suo b/src/Second-server.suo
deleted file mode 100644
index 4ed1adc6caf95b954560bdc53dda8ae018d392d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27648
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