aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/GridService/GridService.cs6
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs21
-rw-r--r--OpenSim/Services/MapImageService/MapImageService.cs2
3 files changed, 21 insertions, 8 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 82a9193..eae10e8 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Services.GridService
237 } 237 }
238 238
239 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", 239 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}",
240 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY); 240 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY);
241 241
242 return String.Empty; 242 return String.Empty;
243 } 243 }
@@ -250,8 +250,8 @@ namespace OpenSim.Services.GridService
250 250
251 m_log.DebugFormat( 251 m_log.DebugFormat(
252 "[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}", 252 "[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}",
253 region.RegionName, region.RegionID, region.posX, region.posY); 253 region.RegionName, region.RegionID, region.coordX, region.coordY);
254 254
255 int flags = Convert.ToInt32(region.Data["flags"]); 255 int flags = Convert.ToInt32(region.Data["flags"]);
256 256
257 if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0) 257 if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0)
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 41dd20c..7137f9a 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -103,9 +103,8 @@ namespace OpenSim.Services.Interfaces
103 int GetRegionFlags(UUID scopeID, UUID regionID); 103 int GetRegionFlags(UUID scopeID, UUID regionID);
104 } 104 }
105 105
106 public class GridRegion : Object 106 public class GridRegion
107 { 107 {
108
109 /// <summary> 108 /// <summary>
110 /// The port by which http communication occurs with the region 109 /// The port by which http communication occurs with the region
111 /// </summary> 110 /// </summary>
@@ -149,6 +148,19 @@ namespace OpenSim.Services.Interfaces
149 148
150 protected IPEndPoint m_internalEndPoint; 149 protected IPEndPoint m_internalEndPoint;
151 150
151 /// <summary>
152 /// The co-ordinate of this region.
153 /// </summary>
154 public int RegionCoordX { get { return RegionLocX / (int)Constants.RegionSize; } }
155
156 /// <summary>
157 /// The co-ordinate of this region
158 /// </summary>
159 public int RegionCoordY { get { return RegionLocY / (int)Constants.RegionSize; } }
160
161 /// <summary>
162 /// The location of this region in meters.
163 /// </summary>
152 public int RegionLocX 164 public int RegionLocX
153 { 165 {
154 get { return m_regionLocX; } 166 get { return m_regionLocX; }
@@ -156,6 +168,9 @@ namespace OpenSim.Services.Interfaces
156 } 168 }
157 protected int m_regionLocX; 169 protected int m_regionLocX;
158 170
171 /// <summary>
172 /// The location of this region in meters.
173 /// </summary>
159 public int RegionLocY 174 public int RegionLocY
160 { 175 {
161 get { return m_regionLocY; } 176 get { return m_regionLocY; }
@@ -407,8 +422,6 @@ namespace OpenSim.Services.Interfaces
407 422
408 if (kvp.ContainsKey("Token")) 423 if (kvp.ContainsKey("Token"))
409 Token = kvp["Token"].ToString(); 424 Token = kvp["Token"].ToString();
410
411 } 425 }
412 } 426 }
413
414} 427}
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 83727b6..a85ee70 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Services.MapImageService
208 208
209 private bool CreateTile(uint zoomLevel, int x, int y) 209 private bool CreateTile(uint zoomLevel, int x, int y)
210 { 210 {
211 m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel); 211// m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel);
212 int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2); 212 int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2);
213 int thisWidth = (int)Math.Pow(2, (double)zoomLevel - 1); 213 int thisWidth = (int)Math.Pow(2, (double)zoomLevel - 1);
214 214