* 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

5 files changed, 25 insertions, 29 deletions

diff --git a/src/Main.cs b/src/Main.cs
index da926db..6075035 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 59833d8..83d8599 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 6d049ce..a4cd744 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 44be1db..86fc54c 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 4ed1adc..0000000
--- a/src/Second-server.suo
+++ /dev/null