aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorRobert Adams2015-03-28 07:50:04 -0700
committerRobert Adams2015-03-28 07:50:04 -0700
commit08c72a8dc1e54114559521a6c2952905ecf6f105 (patch)
treecdc1f379109500504516755fcd3d4e9c6c4e3218 /OpenSim/ApplicationPlugins/RemoteController
parentvarregion: refactor use of 'double heightmap[,]' into references to new class... (diff)
downloadopensim-SC-08c72a8dc1e54114559521a6c2952905ecf6f105.zip
opensim-SC-08c72a8dc1e54114559521a6c2952905ecf6f105.tar.gz
opensim-SC-08c72a8dc1e54114559521a6c2952905ecf6f105.tar.bz2
opensim-SC-08c72a8dc1e54114559521a6c2952905ecf6f105.tar.xz
varregion: remove use of Constants.RegionSize is various places.
More use of the Util routines for conversion of region handles into addresses.
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 2120116..cb96a55 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1155,7 +1155,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1155 // Set home position 1155 // Set home position
1156 1156
1157 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 1157 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
1158 (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); 1158 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
1159 if (null == home) 1159 if (null == home)
1160 { 1160 {
1161 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName); 1161 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName);
@@ -1385,7 +1385,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1385 if ((null != regionXLocation) && (null != regionYLocation)) 1385 if ((null != regionXLocation) && (null != regionYLocation))
1386 { 1386 {
1387 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 1387 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
1388 (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); 1388 (int)Util.RegionToWorldLoc((uint)regionXLocation), (int)Util.RegionToWorldLoc((uint)regionYLocation));
1389 if (null == home) { 1389 if (null == home) {
1390 m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName); 1390 m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName);
1391 } else { 1391 } else {
@@ -3116,7 +3116,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3116 // Set home position 3116 // Set home position
3117 3117
3118 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 3118 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
3119 (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); 3119 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
3120 if (null == home) { 3120 if (null == home) {
3121 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]); 3121 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]);
3122 } else { 3122 } else {