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

Non-functional changes of numbers into symbolic references and a few 

comments on what variables really mean.
0.8.0.3
Robert Adams 2014-02-15 16:01:01 -08:00
parent f6913e911e
commit bdbbeaa494
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
View File

@ -126,7 +126,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
foreach (MapBlockData b in mapBlocks) foreach (MapBlockData b in mapBlocks)
{ {
b.Name = string.Empty; b.Name = string.Empty;
b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's // Set 'simulator is offline'. We need this because the viewer ignores SimAccess.Unknown (255)
b.Access = (byte)SimAccess.Down;
} }
m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count); m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count);

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
View File

@ -125,14 +125,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
public OpenSim.Services.Interfaces.GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) public OpenSim.Services.Interfaces.GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion)
{ {
uint x, y; uint x, y;
Utils.LongToUInts(regionHandle, out x, out y); Util.RegionHandleToRegionLoc(regionHandle, out x, out y);
foreach (Scene s in m_Scenes) foreach (Scene s in m_Scenes)
{ {
if (s.RegionInfo.RegionHandle == regionHandle) if (s.RegionInfo.RegionHandle == regionHandle)
{ {
m_log.DebugFormat("[LOCAL NEIGHBOUR SERVICE CONNECTOR]: HelloNeighbour from region {0} to neighbour {1} at {2}-{3}", m_log.DebugFormat("[LOCAL NEIGHBOUR SERVICE CONNECTOR]: HelloNeighbour from region {0} to neighbour {1} at {2}-{3}",
thisRegion.RegionName, s.Name, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y) ); thisRegion.RegionName, s.Name, x, y );
//m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour");
return s.IncomingHelloNeighbour(thisRegion); return s.IncomingHelloNeighbour(thisRegion);

2
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View File

@ -214,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// final block, closing the search result // final block, closing the search result
MapBlockData data = new MapBlockData(); MapBlockData data = new MapBlockData();
data.Agents = 0; data.Agents = 0;
data.Access = 255; data.Access = (byte)SimAccess.NonExistent;
data.MapImageId = UUID.Zero; data.MapImageId = UUID.Zero;
data.Name = ""; data.Name = "";
data.RegionFlags = 0; data.RegionFlags = 0;

1
OpenSim/Region/RegionCombinerModule/RegionData.cs
View File

@ -34,6 +34,7 @@ namespace OpenSim.Region.RegionCombinerModule
{ {
public UUID RegionId; public UUID RegionId;
public Scene RegionScene; public Scene RegionScene;
// Offset of this region from the base of the root region.
public Vector3 Offset; public Vector3 Offset;
} }
} }