Fixed SimpleApp - aka thankgoditssundaycommit

* Updated SimpleApp with various introduced dependencies
* Extracted ScenePrescence creation in Scene
* removed try-catchall from UserManagerBase (that actually hid a bug)
* Refactored RegionInfo
  * handle is calculated
  * it will explode upon accessing x,y,ip,port,externalip if not explicitly initialized
* Removed superfluous 'ref' keywords
* Removed a shitload of 'catch Exception e' that causes build warnings
* Lots of small refactorings, renames et c
* Ignored some bins

6 files changed, 13 insertions, 17 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 6cf254b..5a2a5c8 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -69,14 +69,14 @@ namespace OpenSim.Region.Communications.Local
             return profile;

         }

 

-        public override bool AuthenticateUser(ref UserProfileData profile, string password)

+        public override bool AuthenticateUser(UserProfileData profile, string password)

         {

             //for now we will accept any password in sandbox mode

             Console.WriteLine("authorising user");

             return true;

         }

 

-        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)

+        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)

         {

             ulong currentRegion = theUser.currentAgent.currentHandle;

             RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);

diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index f9f6b7d..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="LocalUserServices.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="CommunicationsLocal.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LocalBackEndServices.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="LocalUserServices.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index bfefabf..3cac9d3 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="LocalUserServices.cs" />

                 <include name="CommunicationsLocal.cs" />

                 <include name="LocalBackEndServices.cs" />

+                <include name="LocalUserServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 5f0c80c..2ac7297 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -75,18 +75,14 @@ namespace OpenSim.Region.Communications.OGS1
 

             foreach (Hashtable n in (Hashtable)respData.Values)

             {

-                RegionInfo neighbour = new RegionInfo();

+                RegionInfo neighbour = new RegionInfo( (uint)n["x"], (uint)n["y"], (string)n["sim_ip"], (int)n["sim_port"], (string)n["sim_uri"] );

 

                 //OGS1

-                neighbour.RegionHandle = (ulong)n["regionhandle"];

-                neighbour.RegionLocX = (uint)n["x"];

-                neighbour.RegionLocY = (uint)n["y"];

+                //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally

+

                 neighbour.RegionName = (string)n["name"];

 

                 //OGS1+

-                neighbour.CommsIPListenAddr = (string)n["sim_ip"];

-                neighbour.CommsIPListenPort = (int)n["sim_port"];

-                neighbour.CommsExternalAddress = (string)n["sim_uri"];

                 neighbour.SimUUID = (string)n["uuid"];

 

                 neighbours.Add(neighbour);

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 90a01b6..d6abd13 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,9 +116,6 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="OGS1UserServices.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="CommunicationsOGS1.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -128,6 +125,9 @@
     <Compile Include="OGS1InterSimComms.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="OGS1UserServices.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 960a84a..04d61b9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="OGS1UserServices.cs" />

                 <include name="CommunicationsOGS1.cs" />

                 <include name="OGS1GridServices.cs" />

                 <include name="OGS1InterSimComms.cs" />

+                <include name="OGS1UserServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">