aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-08-19 08:48:50 +0100
committerUbitUmarov2015-08-19 08:48:50 +0100
commit0b105da626ae8c2fb519a817b827f90534ed7d08 (patch)
tree509e6d091fb12f38fd09528335e51aeedbe59c08 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parentMerge branch 'master' into ubitworkmaster (diff)
parentvarregion: update MapImageServiceModule to upload multiple map tiles for larg... (diff)
downloadopensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.zip
opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.gz
opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.bz2
opensim-SC_OLD-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.xz
Merge branch 'mbworkvar2' into ubitvar
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-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 e71e81c..2e128a7 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1157,7 +1157,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1157 // Set home position 1157 // Set home position
1158 1158
1159 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 1159 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
1160 (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); 1160 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
1161 if (null == home) 1161 if (null == home)
1162 { 1162 {
1163 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName); 1163 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName);
@@ -1387,7 +1387,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1387 if ((null != regionXLocation) && (null != regionYLocation)) 1387 if ((null != regionXLocation) && (null != regionYLocation))
1388 { 1388 {
1389 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 1389 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
1390 (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); 1390 (int)Util.RegionToWorldLoc((uint)regionXLocation), (int)Util.RegionToWorldLoc((uint)regionYLocation));
1391 if (null == home) { 1391 if (null == home) {
1392 m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName); 1392 m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName);
1393 } else { 1393 } else {
@@ -3118,7 +3118,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3118 // Set home position 3118 // Set home position
3119 3119
3120 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 3120 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
3121 (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize)); 3121 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
3122 if (null == home) { 3122 if (null == home) {
3123 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]); 3123 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]);
3124 } else { 3124 } else {