From 5e805656db1215518a344d6d5364629a4997fd47 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 1 Jul 2007 13:17:27 +0000
Subject: 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

---
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')

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);
-- 
cgit v1.1