diff options
author | Robert Adams | 2013-11-28 08:20:16 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-28 08:20:16 -0800 |
commit | 7aa00632b90f9c24ff6b0fa0da385744a6573c32 (patch) | |
tree | bc63b12b893d3842932e4d0a3def8ed038288004 /OpenSim/ApplicationPlugins | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.zip opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.gz opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.bz2 opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.xz |
varregion: many replacements of in-place arithmetic with calls to
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index febe1d7..642e82e 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1022,7 +1022,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1022 | // Set home position | 1022 | // Set home position |
1023 | 1023 | ||
1024 | GridRegion home = scene.GridService.GetRegionByPosition(scopeID, | 1024 | GridRegion home = scene.GridService.GetRegionByPosition(scopeID, |
1025 | (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); | 1025 | (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation)); |
1026 | if (null == home) | 1026 | if (null == home) |
1027 | { | 1027 | { |
1028 | m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName); | 1028 | m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName); |
@@ -1252,7 +1252,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1252 | if ((null != regionXLocation) && (null != regionYLocation)) | 1252 | if ((null != regionXLocation) && (null != regionYLocation)) |
1253 | { | 1253 | { |
1254 | GridRegion home = scene.GridService.GetRegionByPosition(scopeID, | 1254 | GridRegion home = scene.GridService.GetRegionByPosition(scopeID, |
1255 | (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); | 1255 | (int)Util.RegionToWorldLoc((uint)regionXLocation), (int)Util.RegionToWorldLoc((uint)regionYLocation)); |
1256 | if (null == home) { | 1256 | if (null == home) { |
1257 | m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName); | 1257 | m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName); |
1258 | } else { | 1258 | } else { |
@@ -2883,7 +2883,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2883 | // Set home position | 2883 | // Set home position |
2884 | 2884 | ||
2885 | GridRegion home = scene.GridService.GetRegionByPosition(scopeID, | 2885 | GridRegion home = scene.GridService.GetRegionByPosition(scopeID, |
2886 | (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); | 2886 | (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation)); |
2887 | if (null == home) { | 2887 | if (null == home) { |
2888 | m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]); | 2888 | m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]); |
2889 | } else { | 2889 | } else { |