OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the crashing when trying to look at the map in grid mode. Although the textures for the regions don't seem to show up, about to look into that.

Sugilite
MW 2007-07-10 18:58:42 +00:00
parent 7f03246653
commit ebdc64730a
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Framework/General/Types/RegionInfo.cs
View File

@ -117,6 +117,20 @@ namespace OpenSim.Framework.Types
} }
} }
// Only used for remote regions , ie ones not in the current instance
private uint m_remotingPort;
public uint RemotingPort
{
get
{
return m_remotingPort;
}
set
{
m_remotingPort = value;
}
}
public string DataStore = ""; public string DataStore = "";
public bool isSandbox = false; public bool isSandbox = false;

23
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -151,20 +151,23 @@ namespace OpenSim.Region.Communications.OGS1
List<MapBlockData> neighbours = new List<MapBlockData>(); List<MapBlockData> neighbours = new List<MapBlockData>();
foreach (Hashtable n in (Hashtable)respData.Values) foreach (ArrayList a in respData.Values)
{ {
MapBlockData neighbour = new MapBlockData(); foreach (Hashtable n in a)
{
MapBlockData neighbour = new MapBlockData();
neighbour.X = (ushort)n["x"]; neighbour.X = Convert.ToUInt16(n["x"]);
neighbour.Y = (ushort)n["y"]; neighbour.Y = Convert.ToUInt16(n["y"]);
neighbour.Name = (string)n["name"]; neighbour.Name = (string)n["name"];
neighbour.Access = (byte)n["access"]; neighbour.Access = Convert.ToByte(n["access"]);
neighbour.RegionFlags = (uint)n["region-flags"]; neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]);
neighbour.WaterHeight = (byte)n["water-height"]; neighbour.WaterHeight = Convert.ToByte(n["water-height"]);
neighbour.MapImageId = (string)n["map-image-id"]; neighbour.MapImageId = (string)n["map-image-id"];
neighbours.Add(neighbour); neighbours.Add(neighbour);
}
} }
return neighbours; return neighbours;