aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs14
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs23
2 files changed, 27 insertions, 10 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index e6bc82a..72d1a4c 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -117,6 +117,20 @@ namespace OpenSim.Framework.Types
117 } 117 }
118 } 118 }
119 119
120 // Only used for remote regions , ie ones not in the current instance
121 private uint m_remotingPort;
122 public uint RemotingPort
123 {
124 get
125 {
126 return m_remotingPort;
127 }
128 set
129 {
130 m_remotingPort = value;
131 }
132 }
133
120 public string DataStore = ""; 134 public string DataStore = "";
121 public bool isSandbox = false; 135 public bool isSandbox = false;
122 136
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 50a31c6..1cadf9b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -151,20 +151,23 @@ namespace OpenSim.Region.Communications.OGS1
151 151
152 List<MapBlockData> neighbours = new List<MapBlockData>(); 152 List<MapBlockData> neighbours = new List<MapBlockData>();
153 153
154 foreach (Hashtable n in (Hashtable)respData.Values) 154 foreach (ArrayList a in respData.Values)
155 { 155 {
156 MapBlockData neighbour = new MapBlockData(); 156 foreach (Hashtable n in a)
157 {
158 MapBlockData neighbour = new MapBlockData();
157 159
158 neighbour.X = (ushort)n["x"]; 160 neighbour.X = Convert.ToUInt16(n["x"]);
159 neighbour.Y = (ushort)n["y"]; 161 neighbour.Y = Convert.ToUInt16(n["y"]);
160 162
161 neighbour.Name = (string)n["name"]; 163 neighbour.Name = (string)n["name"];
162 neighbour.Access = (byte)n["access"]; 164 neighbour.Access = Convert.ToByte(n["access"]);
163 neighbour.RegionFlags = (uint)n["region-flags"]; 165 neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]);
164 neighbour.WaterHeight = (byte)n["water-height"]; 166 neighbour.WaterHeight = Convert.ToByte(n["water-height"]);
165 neighbour.MapImageId = (string)n["map-image-id"]; 167 neighbour.MapImageId = (string)n["map-image-id"];
166 168
167 neighbours.Add(neighbour); 169 neighbours.Add(neighbour);
170 }
168 } 171 }
169 172
170 return neighbours; 173 return neighbours;