aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs20
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs8
-rw-r--r--OpenSim/Framework/RegionInfo.cs68
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs24
-rw-r--r--OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs22
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs4
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs8
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs28
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs4
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs4
28 files changed, 137 insertions, 161 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 74a7a50..1d63d26 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -184,11 +184,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
184 return false; 184 return false;
185 } 185 }
186 else if ( 186 else if (
187 regions[i].LegacyRegionLocX == regions[j].LegacyRegionLocX && regions[i].LegacyRegionLocY == regions[j].LegacyRegionLocY) 187 regions[i].RegionLocX == regions[j].RegionLocX && regions[i].RegionLocY == regions[j].RegionLocY)
188 { 188 {
189 m_log.ErrorFormat( 189 m_log.ErrorFormat(
190 "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})", 190 "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})",
191 regions[i].RegionName, regions[j].RegionName, regions[i].LegacyRegionLocX, regions[i].LegacyRegionLocY); 191 regions[i].RegionName, regions[j].RegionName, regions[i].RegionLocX, regions[i].RegionLocY);
192 return false; 192 return false;
193 } 193 }
194 else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port) 194 else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 642e82e..ec58692 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -545,7 +545,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
545 throw new Exception( 545 throw new Exception(
546 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", 546 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>",
547 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 547 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
548 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); 548 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
549 } 549 }
550 else 550 else
551 { 551 {
@@ -559,8 +559,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
559 region.RegionID = regionID; 559 region.RegionID = regionID;
560 region.originRegionID = regionID; 560 region.originRegionID = regionID;
561 region.RegionName = (string) requestData["region_name"]; 561 region.RegionName = (string) requestData["region_name"];
562 region.LegacyRegionLocX = Convert.ToUInt32(requestData["region_x"]); 562 region.RegionLocX = Convert.ToUInt32(requestData["region_x"]);
563 region.LegacyRegionLocY = Convert.ToUInt32(requestData["region_y"]); 563 region.RegionLocY = Convert.ToUInt32(requestData["region_y"]);
564 564
565 // check for collisions: region name, region UUID, 565 // check for collisions: region name, region UUID,
566 // region location 566 // region location
@@ -568,14 +568,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
568 throw new Exception( 568 throw new Exception(
569 String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>", 569 String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>",
570 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 570 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
571 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); 571 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
572 572
573 if (m_application.SceneManager.TryGetScene(region.LegacyRegionLocX, region.LegacyRegionLocY, out scene)) 573 if (m_application.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene))
574 throw new Exception( 574 throw new Exception(
575 String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>", 575 String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>",
576 region.LegacyRegionLocX, region.LegacyRegionLocY, 576 region.RegionLocX, region.RegionLocY,
577 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 577 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
578 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); 578 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
579 579
580 region.InternalEndPoint = 580 region.InternalEndPoint =
581 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); 581 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0);
@@ -589,7 +589,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
589 region.InternalEndPoint.Address, 589 region.InternalEndPoint.Address,
590 region.InternalEndPoint.Port, 590 region.InternalEndPoint.Port,
591 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 591 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
592 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); 592 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
593 593
594 region.ExternalHostName = (string) requestData["external_address"]; 594 region.ExternalHostName = (string) requestData["external_address"];
595 595
@@ -628,8 +628,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
628 String.Format( 628 String.Format(
629 m_config.GetString("region_file_template", 629 m_config.GetString("region_file_template",
630 "{0}x{1}-{2}.ini"), 630 "{0}x{1}-{2}.ini"),
631 region.LegacyRegionLocX.ToString(), 631 region.RegionLocX.ToString(),
632 region.LegacyRegionLocY.ToString(), 632 region.RegionLocY.ToString(),
633 regionID.ToString(), 633 regionID.ToString(),
634 region.InternalEndPoint.Port.ToString(), 634 region.InternalEndPoint.Port.ToString(),
635 region.RegionName.Replace(" ", "_").Replace(":", "_"). 635 region.RegionName.Replace(" ", "_").Replace(":", "_").
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index b4989d1..dbed8f6 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -300,8 +300,8 @@ namespace OpenSim.Data.Tests
300 300
301 RegionInfo regionInfo = new RegionInfo(); 301 RegionInfo regionInfo = new RegionInfo();
302 regionInfo.RegionID = region3; 302 regionInfo.RegionID = region3;
303 regionInfo.LegacyRegionLocX = 0; 303 regionInfo.RegionLocX = 0;
304 regionInfo.LegacyRegionLocY = 0; 304 regionInfo.RegionLocY = 0;
305 305
306 SceneObjectPart sop = new SceneObjectPart(); 306 SceneObjectPart sop = new SceneObjectPart();
307 SceneObjectGroup sog = new SceneObjectGroup(sop); 307 SceneObjectGroup sog = new SceneObjectGroup(sop);
@@ -1066,8 +1066,8 @@ namespace OpenSim.Data.Tests
1066 { 1066 {
1067 RegionInfo regionInfo = new RegionInfo(); 1067 RegionInfo regionInfo = new RegionInfo();
1068 regionInfo.RegionID = regionId; 1068 regionInfo.RegionID = regionId;
1069 regionInfo.LegacyRegionLocX = 0; 1069 regionInfo.RegionLocX = 0;
1070 regionInfo.LegacyRegionLocY = 0; 1070 regionInfo.RegionLocY = 0;
1071 1071
1072 SceneObjectPart sop = new SceneObjectPart(); 1072 SceneObjectPart sop = new SceneObjectPart();
1073 sop.Name = name; 1073 sop.Name = name;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 63b3d89..35278f8 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -144,9 +144,9 @@ namespace OpenSim.Framework
144 public UUID ScopeID = UUID.Zero; 144 public UUID ScopeID = UUID.Zero;
145 private UUID m_maptileStaticUUID = UUID.Zero; 145 private UUID m_maptileStaticUUID = UUID.Zero;
146 146
147 public uint RegionWorldLocX = 0; 147 public uint WorldLocX = 0;
148 public uint RegionWorldLocY = 0; 148 public uint WorldLocY = 0;
149 public uint RegionWorldLocZ = 0; 149 public uint WorldLocZ = 0;
150 public uint RegionSizeX = Constants.RegionSize; 150 public uint RegionSizeX = Constants.RegionSize;
151 public uint RegionSizeY = Constants.RegionSize; 151 public uint RegionSizeY = Constants.RegionSize;
152 public uint RegionSizeZ = Constants.RegionHeight; 152 public uint RegionSizeZ = Constants.RegionHeight;
@@ -452,52 +452,28 @@ namespace OpenSim.Framework
452 /// Coordinate is scaled as world coordinates divided by the legacy region size 452 /// Coordinate is scaled as world coordinates divided by the legacy region size
453 /// and is thus is the number of legacy regions. 453 /// and is thus is the number of legacy regions.
454 /// </summary> 454 /// </summary>
455 public uint LegacyRegionLocX
456 {
457 get { return RegionWorldLocX / Constants.RegionSize; }
458 set { RegionWorldLocX = value * Constants.RegionSize; }
459 }
460
461 /// <summary>
462 /// The y co-ordinate of this region in map tiles (e.g. 1000).
463 /// Coordinate is scaled as world coordinates divided by the legacy region size
464 /// and is thus is the number of legacy regions.
465 /// </summary>
466 public uint LegacyRegionLocY
467 {
468 get { return RegionWorldLocY / Constants.RegionSize; }
469 set { RegionWorldLocY = value * Constants.RegionSize; }
470 }
471
472 /// <summary>
473 /// The x co-ordinate of this region in map tiles (e.g. 1000).
474 /// Coordinate is scaled as world coordinates divided by the legacy region size
475 /// and is thus is the number of legacy regions.
476 /// DO NOT USE FOR NEW CODE! This entrypoint exists for downward compatability with external modules.
477 /// </summary>
478 public uint RegionLocX 455 public uint RegionLocX
479 { 456 {
480 get { return LegacyRegionLocX; } 457 get { return WorldLocX / Constants.RegionSize; }
481 set { LegacyRegionLocX = value; } 458 set { WorldLocX = value * Constants.RegionSize; }
482 } 459 }
483 460
484 /// <summary> 461 /// <summary>
485 /// The y co-ordinate of this region in map tiles (e.g. 1000). 462 /// The y co-ordinate of this region in map tiles (e.g. 1000).
486 /// Coordinate is scaled as world coordinates divided by the legacy region size 463 /// Coordinate is scaled as world coordinates divided by the legacy region size
487 /// and is thus is the number of legacy regions. 464 /// and is thus is the number of legacy regions.
488 /// DO NOT USE FOR NEW CODE! This entrypoint exists for downward compatability with external modules.
489 /// </summary> 465 /// </summary>
490 public uint RegionLocY 466 public uint RegionLocY
491 { 467 {
492 get { return LegacyRegionLocY; } 468 get { return WorldLocY / Constants.RegionSize; }
493 set { LegacyRegionLocY = value; } 469 set { WorldLocY = value * Constants.RegionSize; }
494 } 470 }
495 471
496 public void SetDefaultRegionSize() 472 public void SetDefaultRegionSize()
497 { 473 {
498 RegionWorldLocX = 0; 474 WorldLocX = 0;
499 RegionWorldLocY = 0; 475 WorldLocY = 0;
500 RegionWorldLocZ = 0; 476 WorldLocZ = 0;
501 RegionSizeX = Constants.RegionSize; 477 RegionSizeX = Constants.RegionSize;
502 RegionSizeY = Constants.RegionSize; 478 RegionSizeY = Constants.RegionSize;
503 RegionSizeZ = Constants.RegionHeight; 479 RegionSizeZ = Constants.RegionHeight;
@@ -508,7 +484,7 @@ namespace OpenSim.Framework
508 // compute the region coordinates from it. 484 // compute the region coordinates from it.
509 public ulong RegionHandle 485 public ulong RegionHandle
510 { 486 {
511 get { return Util.UIntsToLong(RegionWorldLocX, RegionWorldLocY); } 487 get { return Util.UIntsToLong(WorldLocX, WorldLocY); }
512 } 488 }
513 489
514 public void SetEndPoint(string ipaddr, int port) 490 public void SetEndPoint(string ipaddr, int port)
@@ -615,8 +591,8 @@ namespace OpenSim.Framework
615 591
616 string[] locationElements = location.Split(new char[] {','}); 592 string[] locationElements = location.Split(new char[] {','});
617 593
618 LegacyRegionLocX = Convert.ToUInt32(locationElements[0]); 594 RegionLocX = Convert.ToUInt32(locationElements[0]);
619 LegacyRegionLocY = Convert.ToUInt32(locationElements[1]); 595 RegionLocY = Convert.ToUInt32(locationElements[1]);
620 596
621 // Region size 597 // Region size
622 // Default to legacy region size if not specified. 598 // Default to legacy region size if not specified.
@@ -815,7 +791,7 @@ namespace OpenSim.Framework
815 791
816 config.Set("RegionUUID", RegionID.ToString()); 792 config.Set("RegionUUID", RegionID.ToString());
817 793
818 string location = String.Format("{0},{1}", LegacyRegionLocX, LegacyRegionLocY); 794 string location = String.Format("{0},{1}", RegionLocX, RegionLocY);
819 config.Set("Location", location); 795 config.Set("Location", location);
820 796
821 if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize) 797 if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
@@ -909,9 +885,9 @@ namespace OpenSim.Framework
909 "Region Name", RegionName, true); 885 "Region Name", RegionName, true);
910 886
911 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 887 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
912 "Grid Location (X Axis)", LegacyRegionLocX.ToString(), true); 888 "Grid Location (X Axis)", RegionLocX.ToString(), true);
913 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 889 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
914 "Grid Location (Y Axis)", LegacyRegionLocY.ToString(), true); 890 "Grid Location (Y Axis)", RegionLocY.ToString(), true);
915 configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 891 configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
916 "Size of region in X dimension", RegionSizeX.ToString(), true); 892 "Size of region in X dimension", RegionSizeX.ToString(), true);
917 configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 893 configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
@@ -1050,10 +1026,10 @@ namespace OpenSim.Framework
1050 RegionName = (string) configuration_result; 1026 RegionName = (string) configuration_result;
1051 break; 1027 break;
1052 case "sim_location_x": 1028 case "sim_location_x":
1053 LegacyRegionLocX = (uint) configuration_result; 1029 RegionLocX = (uint) configuration_result;
1054 break; 1030 break;
1055 case "sim_location_y": 1031 case "sim_location_y":
1056 LegacyRegionLocY = (uint) configuration_result; 1032 RegionLocY = (uint) configuration_result;
1057 break; 1033 break;
1058 case "sim_size_x": 1034 case "sim_size_x":
1059 RegionSizeX = (uint) configuration_result; 1035 RegionSizeX = (uint) configuration_result;
@@ -1144,8 +1120,8 @@ namespace OpenSim.Framework
1144 args["http_port"] = OSD.FromString(HttpPort.ToString()); 1120 args["http_port"] = OSD.FromString(HttpPort.ToString());
1145 args["server_uri"] = OSD.FromString(ServerURI); 1121 args["server_uri"] = OSD.FromString(ServerURI);
1146 1122
1147 args["region_xloc"] = OSD.FromString(LegacyRegionLocX.ToString()); 1123 args["region_xloc"] = OSD.FromString(RegionLocX.ToString());
1148 args["region_yloc"] = OSD.FromString(LegacyRegionLocY.ToString()); 1124 args["region_yloc"] = OSD.FromString(RegionLocY.ToString());
1149 args["region_size_x"] = OSD.FromString(RegionSizeX.ToString()); 1125 args["region_size_x"] = OSD.FromString(RegionSizeX.ToString());
1150 args["region_size_y"] = OSD.FromString(RegionSizeY.ToString()); 1126 args["region_size_y"] = OSD.FromString(RegionSizeY.ToString());
1151 args["region_size_z"] = OSD.FromString(RegionSizeZ.ToString()); 1127 args["region_size_z"] = OSD.FromString(RegionSizeZ.ToString());
@@ -1180,13 +1156,13 @@ namespace OpenSim.Framework
1180 { 1156 {
1181 uint locx; 1157 uint locx;
1182 UInt32.TryParse(args["region_xloc"].AsString(), out locx); 1158 UInt32.TryParse(args["region_xloc"].AsString(), out locx);
1183 LegacyRegionLocX = locx; 1159 RegionLocX = locx;
1184 } 1160 }
1185 if (args["region_yloc"] != null) 1161 if (args["region_yloc"] != null)
1186 { 1162 {
1187 uint locy; 1163 uint locy;
1188 UInt32.TryParse(args["region_yloc"].AsString(), out locy); 1164 UInt32.TryParse(args["region_yloc"].AsString(), out locy);
1189 LegacyRegionLocY = locy; 1165 RegionLocY = locy;
1190 } 1166 }
1191 if (args.ContainsKey("region_size_x")) 1167 if (args.ContainsKey("region_size_x"))
1192 RegionSizeX = (uint)args["region_size_x"].AsInteger(); 1168 RegionSizeX = (uint)args["region_size_x"].AsInteger();
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1d93e9b..c2d9942 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -825,8 +825,8 @@ namespace OpenSim
825 MainConsole.Instance.Output(String.Format( 825 MainConsole.Instance.Output(String.Format(
826 "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}", 826 "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}",
827 scene.RegionInfo.RegionName, 827 scene.RegionInfo.RegionName,
828 scene.RegionInfo.LegacyRegionLocX, 828 scene.RegionInfo.RegionLocX,
829 scene.RegionInfo.LegacyRegionLocY, 829 scene.RegionInfo.RegionLocY,
830 scene.RegionInfo.InternalEndPoint.Port, 830 scene.RegionInfo.InternalEndPoint.Port,
831 scene.RegionInfo.EstateSettings.EstateName)); 831 scene.RegionInfo.EstateSettings.EstateName));
832 }); 832 });
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7e7f42e..0dc9306 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -743,7 +743,7 @@ namespace OpenSim
743 { 743 {
744 m_log.InfoFormat( 744 m_log.InfoFormat(
745 "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", 745 "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})",
746 whichRegion.RegionName, whichRegion.LegacyRegionLocX, whichRegion.LegacyRegionLocY); 746 whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY);
747 747
748 ShutdownClientServer(whichRegion); 748 ShutdownClientServer(whichRegion);
749 IScene scene; 749 IScene scene;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a9ae71c..c250787 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2885,8 +2885,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2885 { 2885 {
2886 pos = (land.AABBMax + land.AABBMin) * 0.5f; 2886 pos = (land.AABBMax + land.AABBMin) * 0.5f;
2887 } 2887 }
2888 reply.Data.GlobalX = info.LegacyRegionLocX + x; 2888 reply.Data.GlobalX = info.RegionLocX + x;
2889 reply.Data.GlobalY = info.LegacyRegionLocY + y; 2889 reply.Data.GlobalY = info.RegionLocY + y;
2890 reply.Data.GlobalZ = pos.Z; 2890 reply.Data.GlobalZ = pos.Z;
2891 reply.Data.SimName = Utils.StringToBytes(info.RegionName); 2891 reply.Data.SimName = Utils.StringToBytes(info.RegionName);
2892 reply.Data.SnapshotID = land.SnapshotID; 2892 reply.Data.SnapshotID = land.SnapshotID;
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index db62b31..10122e6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
189 string message = c.Message; 189 string message = c.Message;
190 Scene scene = (Scene)c.Scene; 190 Scene scene = (Scene)c.Scene;
191 Vector3 fromPos = c.Position; 191 Vector3 fromPos = c.Position;
192 Vector3 regionPos = new Vector3(scene.RegionInfo.RegionWorldLocX, scene.RegionInfo.RegionWorldLocY, 0); 192 Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
193 193
194 if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; 194 if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel;
195 195
@@ -341,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
341 { 341 {
342 Vector3 fromRegionPos = fromPos + regionPos; 342 Vector3 fromRegionPos = fromPos + regionPos;
343 Vector3 toRegionPos = presence.AbsolutePosition + 343 Vector3 toRegionPos = presence.AbsolutePosition +
344 new Vector3(presence.Scene.RegionInfo.RegionWorldLocX, presence.Scene.RegionInfo.RegionWorldLocY, 0); 344 new Vector3(presence.Scene.RegionInfo.WorldLocX, presence.Scene.RegionInfo.WorldLocY, 0);
345 345
346 int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); 346 int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
347 347
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index a982466..80dfa04 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -663,8 +663,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
663 663
664 Vector3 avaPos = p.AbsolutePosition; 664 Vector3 avaPos = p.AbsolutePosition;
665 // Getting the global position for the Avatar 665 // Getting the global position for the Avatar
666 Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.RegionWorldLocX + avaPos.X, 666 Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.WorldLocX + avaPos.X,
667 remoteClient.Scene.RegionInfo.RegionWorldLocY + avaPos.Y, 667 remoteClient.Scene.RegionInfo.WorldLocY + avaPos.Y,
668 avaPos.Z); 668 avaPos.Z);
669 669
670 string landOwnerName = string.Empty; 670 string landOwnerName = string.Empty;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index c3d0765..1bb3e3b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -491,8 +491,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
491 } 491 }
492 492
493 // Check that these are not the same coordinates 493 // Check that these are not the same coordinates
494 if (finalDestination.RegionLocX == sp.Scene.RegionInfo.LegacyRegionLocX && 494 if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX &&
495 finalDestination.RegionLocY == sp.Scene.RegionInfo.LegacyRegionLocY) 495 finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY)
496 { 496 {
497 // Can't do. Viewer crashes 497 // Can't do. Viewer crashes
498 sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again."); 498 sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again.");
@@ -564,8 +564,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
564// destRegionX, destRegionY, finalDestination.RegionID, finalDestination.ServerURI); 564// destRegionX, destRegionY, finalDestination.RegionID, finalDestination.ServerURI);
565 565
566 // Insanely, RegionLoc on RegionInfo is the 256m map co-ord whilst GridRegion.RegionLoc is the raw meters position. 566 // Insanely, RegionLoc on RegionInfo is the 256m map co-ord whilst GridRegion.RegionLoc is the raw meters position.
567 return Math.Abs(sourceRegion.LegacyRegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance 567 return Math.Abs(sourceRegion.RegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance
568 && Math.Abs(sourceRegion.LegacyRegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance; 568 && Math.Abs(sourceRegion.RegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance;
569 } 569 }
570 570
571 /// <summary> 571 /// <summary>
@@ -632,7 +632,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
632 string.Format( 632 string.Format(
633 "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way", 633 "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way",
634 finalDestination.RegionName, finalDestination.RegionCoordX, finalDestination.RegionCoordY, 634 finalDestination.RegionName, finalDestination.RegionCoordX, finalDestination.RegionCoordY,
635 sourceRegion.RegionName, sourceRegion.LegacyRegionLocX, sourceRegion.LegacyRegionLocY, 635 sourceRegion.RegionName, sourceRegion.RegionLocX, sourceRegion.RegionLocY,
636 MaxTransferDistance)); 636 MaxTransferDistance));
637 637
638 return; 638 return;
@@ -1919,7 +1919,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1919 1919
1920 if (m_regionInfo != null) 1920 if (m_regionInfo != null)
1921 { 1921 {
1922 neighbours = RequestNeighbours(sp, m_regionInfo.LegacyRegionLocX, m_regionInfo.LegacyRegionLocY); 1922 neighbours = RequestNeighbours(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
1923 } 1923 }
1924 else 1924 else
1925 { 1925 {
@@ -2244,10 +2244,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2244 extent.X = ((int)extent.X / (int)Constants.RegionSize); 2244 extent.X = ((int)extent.X / (int)Constants.RegionSize);
2245 extent.Y = ((int)extent.Y / (int)Constants.RegionSize); 2245 extent.Y = ((int)extent.Y / (int)Constants.RegionSize);
2246 2246
2247 swCorner.X = Scene.RegionInfo.LegacyRegionLocX - 1; 2247 swCorner.X = Scene.RegionInfo.RegionLocX - 1;
2248 swCorner.Y = Scene.RegionInfo.LegacyRegionLocY - 1; 2248 swCorner.Y = Scene.RegionInfo.RegionLocY - 1;
2249 neCorner.X = Scene.RegionInfo.LegacyRegionLocX + extent.X; 2249 neCorner.X = Scene.RegionInfo.RegionLocX + extent.X;
2250 neCorner.Y = Scene.RegionInfo.LegacyRegionLocY + extent.Y; 2250 neCorner.Y = Scene.RegionInfo.RegionLocY + extent.Y;
2251 } 2251 }
2252 2252
2253 /// <summary> 2253 /// <summary>
@@ -2560,8 +2560,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2560 Vector3 oldGroupPosition = grp.RootPart.GroupPosition; 2560 Vector3 oldGroupPosition = grp.RootPart.GroupPosition;
2561 2561
2562 // Compute the absolute position of the object. 2562 // Compute the absolute position of the object.
2563 double objectWorldLocX = (double)scene.RegionInfo.RegionWorldLocX + attemptedPosition.X; 2563 double objectWorldLocX = (double)scene.RegionInfo.WorldLocX + attemptedPosition.X;
2564 double objectWorldLocY = (double)scene.RegionInfo.RegionWorldLocY + attemptedPosition.Y; 2564 double objectWorldLocY = (double)scene.RegionInfo.WorldLocY + attemptedPosition.Y;
2565 2565
2566 // Ask the grid service for the region that contains the passed address 2566 // Ask the grid service for the region that contains the passed address
2567 GridRegion destination = GetRegionContainingWorldLocation(scene.GridService, scene.RegionInfo.ScopeID, objectWorldLocX, objectWorldLocY); 2567 GridRegion destination = GetRegionContainingWorldLocation(scene.GridService, scene.RegionInfo.ScopeID, objectWorldLocX, objectWorldLocY);
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index bf87392..4e7ad75 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -213,8 +213,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
213 if (part != null) 213 if (part != null)
214 { 214 {
215 ObjectRegionName = s.RegionInfo.RegionName; 215 ObjectRegionName = s.RegionInfo.RegionName;
216 uint localX = s.RegionInfo.RegionWorldLocX; 216 uint localX = s.RegionInfo.WorldLocX;
217 uint localY = s.RegionInfo.RegionWorldLocY; 217 uint localY = s.RegionInfo.WorldLocY;
218 ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")"; 218 ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")";
219 return part; 219 return part;
220 } 220 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index c1f2f04..26d22b8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -224,10 +224,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
224 } 224 }
225 225
226 string reason = string.Empty; 226 string reason = string.Empty;
227 if (!m_MapService.AddMapTile((int)scene.RegionInfo.LegacyRegionLocX, (int)scene.RegionInfo.LegacyRegionLocY, jpgData, out reason)) 227 if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, out reason))
228 { 228 {
229 m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}", 229 m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}",
230 scene.RegionInfo.RegionName, scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY, reason); 230 scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason);
231 } 231 }
232 } 232 }
233 } 233 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
index 9aa4243..d8dace2 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
@@ -71,8 +71,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
71 71
72 public void AddScene(Scene scene) 72 public void AddScene(Scene scene)
73 { 73 {
74 uint x = scene.RegionInfo.LegacyRegionLocX; 74 uint x = scene.RegionInfo.RegionLocX;
75 uint y = scene.RegionInfo.LegacyRegionLocY; 75 uint y = scene.RegionInfo.RegionLocY;
76 76
77 SortedDictionary<uint, Scene> row; 77 SortedDictionary<uint, Scene> row;
78 if (!Regions.TryGetValue(y, out row)) 78 if (!Regions.TryGetValue(y, out row))
@@ -120,8 +120,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
120 { 120 {
121 // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name 121 // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name
122 string path = string.Format("{0}_{1}_{2}", 122 string path = string.Format("{0}_{1}_{2}",
123 scene.RegionInfo.LegacyRegionLocX - Rect.X + 1, 123 scene.RegionInfo.RegionLocX - Rect.X + 1,
124 scene.RegionInfo.LegacyRegionLocY - Rect.Y + 1, 124 scene.RegionInfo.RegionLocY - Rect.Y + 1,
125 scene.RegionInfo.RegionName.Replace(' ', '_')); 125 scene.RegionInfo.RegionName.Replace(' ', '_'));
126 m_regionDirs[scene.RegionInfo.RegionID] = path; 126 m_regionDirs[scene.RegionInfo.RegionID] = path;
127 }); 127 });
diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
index 25f1e5c..3dcc020 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
145 { 145 {
146 foreach (RegionInfo archivedRegion in m_directory2region.Values) 146 foreach (RegionInfo archivedRegion in m_directory2region.Values)
147 { 147 {
148 Point location = new Point((int)rootScene.RegionInfo.LegacyRegionLocX, (int)rootScene.RegionInfo.LegacyRegionLocY); 148 Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY);
149 location.Offset(archivedRegion.Location); 149 location.Offset(archivedRegion.Location);
150 150
151 Scene scene; 151 Scene scene;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index bc172a4..173b603 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -96,9 +96,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
96 int x = (args.Length > 5 ? int.Parse(args[5]) : -1); 96 int x = (args.Length > 5 ? int.Parse(args[5]) : -1);
97 int y = (args.Length > 6 ? int.Parse(args[6]) : -1); 97 int y = (args.Length > 6 ? int.Parse(args[6]) : -1);
98 98
99 if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) 99 if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x)
100 { 100 {
101 if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) 101 if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y)
102 { 102 {
103 int corner = int.Parse(num); 103 int corner = int.Parse(num);
104 UUID texture = UUID.Parse(uuid); 104 UUID texture = UUID.Parse(uuid);
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
135 int x = (args.Length > 4 ? int.Parse(args[4]) : -1); 135 int x = (args.Length > 4 ? int.Parse(args[4]) : -1);
136 int y = (args.Length > 5 ? int.Parse(args[5]) : -1); 136 int y = (args.Length > 5 ? int.Parse(args[5]) : -1);
137 137
138 if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) 138 if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x)
139 { 139 {
140 if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) 140 if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y)
141 { 141 {
142 double selectedheight = double.Parse(heightstring); 142 double selectedheight = double.Parse(heightstring);
143 143
@@ -159,9 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
159 int x = (args.Length > 6 ? int.Parse(args[6]) : -1); 159 int x = (args.Length > 6 ? int.Parse(args[6]) : -1);
160 int y = (args.Length > 7 ? int.Parse(args[7]) : -1); 160 int y = (args.Length > 7 ? int.Parse(args[7]) : -1);
161 161
162 if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) 162 if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x)
163 { 163 {
164 if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) 164 if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y)
165 { 165 {
166 int corner = int.Parse(num); 166 int corner = int.Parse(num);
167 float lowValue = float.Parse(min, Culture.NumberFormatInfo); 167 float lowValue = float.Parse(min, Culture.NumberFormatInfo);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index a68f67f..99db7ff 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1798,8 +1798,8 @@ namespace OpenSim.Region.CoreModules.World.Land
1798 // HACK for now 1798 // HACK for now
1799 RegionInfo r = new RegionInfo(); 1799 RegionInfo r = new RegionInfo();
1800 r.RegionName = info.RegionName; 1800 r.RegionName = info.RegionName;
1801 r.LegacyRegionLocX = (uint)info.RegionLocX; 1801 r.RegionLocX = (uint)info.RegionLocX;
1802 r.LegacyRegionLocY = (uint)info.RegionLocY; 1802 r.RegionLocY = (uint)info.RegionLocY;
1803 r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); 1803 r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess);
1804 remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); 1804 remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y);
1805 } 1805 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index d991a30..9766bfe 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -561,8 +561,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
561 /// <param name="fileStartY">Where to begin our slice</param> 561 /// <param name="fileStartY">Where to begin our slice</param>
562 public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) 562 public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
563 { 563 {
564 int offsetX = (int) m_scene.RegionInfo.LegacyRegionLocX - fileStartX; 564 int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
565 int offsetY = (int) m_scene.RegionInfo.LegacyRegionLocY - fileStartY; 565 int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
566 566
567 if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) 567 if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
568 { 568 {
@@ -602,14 +602,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
602 /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> 602 /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param>
603 public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) 603 public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
604 { 604 {
605 int offsetX = (int)m_scene.RegionInfo.LegacyRegionLocX - fileStartX; 605 int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX;
606 int offsetY = (int)m_scene.RegionInfo.LegacyRegionLocY - fileStartY; 606 int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY;
607 607
608 if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) 608 if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight)
609 { 609 {
610 MainConsole.Instance.OutputFormat( 610 MainConsole.Instance.OutputFormat(
611 "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", 611 "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.",
612 m_scene.RegionInfo.LegacyRegionLocX, m_scene.RegionInfo.LegacyRegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); 612 m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY);
613 613
614 return; 614 return;
615 } 615 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 2d564fe..cd315b1 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
249 // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is 249 // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is
250 // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. 250 // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks.
251 251
252 if (m_scene.RegionInfo.LegacyRegionLocX >= 2048 || m_scene.RegionInfo.LegacyRegionLocY >= 2048) 252 if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
253 { 253 {
254 ScenePresence avatarPresence = null; 254 ScenePresence avatarPresence = null;
255 255
@@ -278,10 +278,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
278 List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; 278 List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
279 279
280 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 280 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
281 (int)(m_scene.RegionInfo.LegacyRegionLocX - 8) * (int)Constants.RegionSize, 281 (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
282 (int)(m_scene.RegionInfo.LegacyRegionLocX + 8) * (int)Constants.RegionSize, 282 (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
283 (int)(m_scene.RegionInfo.LegacyRegionLocY - 8) * (int)Constants.RegionSize, 283 (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
284 (int)(m_scene.RegionInfo.LegacyRegionLocY + 8) * (int)Constants.RegionSize); 284 (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
285 foreach (GridRegion r in regions) 285 foreach (GridRegion r in regions)
286 { 286 {
287 MapBlockData block = new MapBlockData(); 287 MapBlockData block = new MapBlockData();
@@ -1218,10 +1218,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1218 1218
1219 List<MapBlockData> mapBlocks = new List<MapBlockData>(); 1219 List<MapBlockData> mapBlocks = new List<MapBlockData>();
1220 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, 1220 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
1221 (int)(m_scene.RegionInfo.LegacyRegionLocX - 9) * (int)Constants.RegionSize, 1221 (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize,
1222 (int)(m_scene.RegionInfo.LegacyRegionLocX + 9) * (int)Constants.RegionSize, 1222 (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize,
1223 (int)(m_scene.RegionInfo.LegacyRegionLocY - 9) * (int)Constants.RegionSize, 1223 (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize,
1224 (int)(m_scene.RegionInfo.LegacyRegionLocY + 9) * (int)Constants.RegionSize); 1224 (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize);
1225 List<AssetBase> textures = new List<AssetBase>(); 1225 List<AssetBase> textures = new List<AssetBase>();
1226 List<Image> bitImages = new List<Image>(); 1226 List<Image> bitImages = new List<Image>();
1227 1227
@@ -1262,8 +1262,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1262 1262
1263 for (int i = 0; i < mapBlocks.Count; i++) 1263 for (int i = 0; i < mapBlocks.Count; i++)
1264 { 1264 {
1265 ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.LegacyRegionLocX) + 10); 1265 ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.RegionLocX) + 10);
1266 ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.LegacyRegionLocY) + 10); 1266 ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.RegionLocY) + 10);
1267 g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top 1267 g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top
1268 } 1268 }
1269 1269
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index be8aed1..3a5aa0f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1110,8 +1110,8 @@ namespace OpenSim.Region.Framework.Scenes
1110 if (RegionInfo.RegionHandle != otherRegion.RegionHandle) 1110 if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
1111 { 1111 {
1112 // If these are cast to INT because long + negative values + abs returns invalid data 1112 // If these are cast to INT because long + negative values + abs returns invalid data
1113 int resultX = Math.Abs((int)xcell - (int)RegionInfo.LegacyRegionLocX); 1113 int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
1114 int resultY = Math.Abs((int)ycell - (int)RegionInfo.LegacyRegionLocY); 1114 int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);
1115 if (resultX <= 1 && resultY <= 1) 1115 if (resultX <= 1 && resultY <= 1)
1116 { 1116 {
1117 // Let the grid service module know, so this can be cached 1117 // Let the grid service module know, so this can be cached
@@ -1186,8 +1186,8 @@ namespace OpenSim.Region.Framework.Scenes
1186 /// </returns> 1186 /// </returns>
1187 public int HaveNeighbor(Cardinals car, ref int[] fix) 1187 public int HaveNeighbor(Cardinals car, ref int[] fix)
1188 { 1188 {
1189 uint neighbourx = RegionInfo.LegacyRegionLocX; 1189 uint neighbourx = RegionInfo.RegionLocX;
1190 uint neighboury = RegionInfo.LegacyRegionLocY; 1190 uint neighboury = RegionInfo.RegionLocY;
1191 1191
1192 int dir = (int)car; 1192 int dir = (int)car;
1193 1193
@@ -1209,8 +1209,8 @@ namespace OpenSim.Region.Framework.Scenes
1209 1209
1210 if (neighbourRegion == null) 1210 if (neighbourRegion == null)
1211 { 1211 {
1212 fix[0] = (int)(RegionInfo.LegacyRegionLocX - neighbourx); 1212 fix[0] = (int)(RegionInfo.RegionLocX - neighbourx);
1213 fix[1] = (int)(RegionInfo.LegacyRegionLocY - neighboury); 1213 fix[1] = (int)(RegionInfo.RegionLocY - neighboury);
1214 return dir * (-1); 1214 return dir * (-1);
1215 } 1215 }
1216 else 1216 else
@@ -4393,8 +4393,8 @@ namespace OpenSim.Region.Framework.Scenes
4393 { 4393 {
4394 uint rRegionX = (uint)(cAgentData.RegionHandle >> 40); 4394 uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
4395 uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8); 4395 uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
4396 uint tRegionX = RegionInfo.LegacyRegionLocX; 4396 uint tRegionX = RegionInfo.RegionLocX;
4397 uint tRegionY = RegionInfo.LegacyRegionLocY; 4397 uint tRegionY = RegionInfo.RegionLocY;
4398 //Send Data to ScenePresence 4398 //Send Data to ScenePresence
4399 childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); 4399 childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
4400 // Not Implemented: 4400 // Not Implemented:
@@ -4636,8 +4636,8 @@ namespace OpenSim.Region.Framework.Scenes
4636 uint regionX, regionY; 4636 uint regionX, regionY;
4637 Util.RegionHandleToWorldLoc(regionHandle, out regionX, out regionY); 4637 Util.RegionHandleToWorldLoc(regionHandle, out regionX, out regionY);
4638 4638
4639 int shiftx = (int) regionX - (int)RegionInfo.RegionWorldLocX; 4639 int shiftx = (int) regionX - (int)RegionInfo.WorldLocX;
4640 int shifty = (int) regionY - (int)RegionInfo.RegionWorldLocY; 4640 int shifty = (int) regionY - (int)RegionInfo.WorldLocY;
4641 4641
4642 position.X += shiftx; 4642 position.X += shiftx;
4643 position.Y += shifty; 4643 position.Y += shifty;
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 2677989..28f7896 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -445,8 +445,8 @@ namespace OpenSim.Region.Framework.Scenes
445 { 445 {
446 foreach (Scene mscene in m_localScenes) 446 foreach (Scene mscene in m_localScenes)
447 { 447 {
448 if (mscene.RegionInfo.LegacyRegionLocX == locX && 448 if (mscene.RegionInfo.RegionLocX == locX &&
449 mscene.RegionInfo.LegacyRegionLocY == locY) 449 mscene.RegionInfo.RegionLocY == locY)
450 { 450 {
451 scene = mscene; 451 scene = mscene;
452 return true; 452 return true;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8eb6f7d..3f5db12 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -702,7 +702,7 @@ namespace OpenSim.Region.Framework.Scenes
702 uint x, y; 702 uint x, y;
703 Util.RegionHandleToRegionLoc(handle, out x, out y); 703 Util.RegionHandleToRegionLoc(handle, out x, out y);
704 704
705 if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.LegacyRegionLocX, y, Scene.RegionInfo.LegacyRegionLocY)) 705 if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY))
706 { 706 {
707 old.Add(handle); 707 old.Add(handle);
708 } 708 }
@@ -2115,8 +2115,8 @@ namespace OpenSim.Region.Framework.Scenes
2115// } 2115// }
2116 2116
2117 // Get terrain height for sub-region in a megaregion if necessary 2117 // Get terrain height for sub-region in a megaregion if necessary
2118 int X = (int)((m_scene.RegionInfo.RegionWorldLocX) + pos.X); 2118 int X = (int)((m_scene.RegionInfo.WorldLocX) + pos.X);
2119 int Y = (int)((m_scene.RegionInfo.RegionWorldLocY) + pos.Y); 2119 int Y = (int)((m_scene.RegionInfo.WorldLocY) + pos.Y);
2120 GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y); 2120 GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y);
2121 // If X and Y is NaN, target_region will be null 2121 // If X and Y is NaN, target_region will be null
2122 if (target_region == null) 2122 if (target_region == null)
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 67998a0..95f9caf 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -437,7 +437,7 @@ namespace OpenSim.Region.Framework.Scenes
437 437
438 SimStats simStats 438 SimStats simStats
439 = new SimStats( 439 = new SimStats(
440 ReportingRegion.LegacyRegionLocX, ReportingRegion.LegacyRegionLocY, regionFlags, (uint)m_objectCapacity, 440 ReportingRegion.RegionLocX, ReportingRegion.RegionLocY, regionFlags, (uint)m_objectCapacity,
441 rb, sb, m_scene.RegionInfo.originRegionID); 441 rb, sb, m_scene.RegionInfo.originRegionID);
442 442
443 handlerSendStatResult = OnSendStatsResult; 443 handlerSendStatResult = OnSendStatsResult;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
index cbc538e..d4fe5e0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs
@@ -84,8 +84,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
84 84
85 Region = scene.RegionInfo.RegionName; 85 Region = scene.RegionInfo.RegionName;
86 Host = scene.RegionInfo.ExternalHostName; 86 Host = scene.RegionInfo.ExternalHostName;
87 LocX = Convert.ToString(scene.RegionInfo.LegacyRegionLocX); 87 LocX = Convert.ToString(scene.RegionInfo.RegionLocX);
88 LocY = Convert.ToString(scene.RegionInfo.LegacyRegionLocY); 88 LocY = Convert.ToString(scene.RegionInfo.RegionLocY);
89 IDK = Convert.ToString(_idk_++); 89 IDK = Convert.ToString(_idk_++);
90 90
91 showAlert = config.GetBoolean("alert_show", false); 91 showAlert = config.GetBoolean("alert_show", false);
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
index 7f616bb..83732e2 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
@@ -100,8 +100,8 @@ namespace OpenSim.Region.RegionCombinerModule
100 UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, 100 UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem,
101 UUID fromtaskid) 101 UUID fromtaskid)
102 { 102 {
103 int differenceX = (int)m_virtScene.RegionInfo.LegacyRegionLocX - (int)m_rootScene.RegionInfo.LegacyRegionLocX; 103 int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
104 int differenceY = (int)m_virtScene.RegionInfo.LegacyRegionLocY - (int)m_rootScene.RegionInfo.LegacyRegionLocY; 104 int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
105 rayend.X += differenceX * (int)Constants.RegionSize; 105 rayend.X += differenceX * (int)Constants.RegionSize;
106 rayend.Y += differenceY * (int)Constants.RegionSize; 106 rayend.Y += differenceY * (int)Constants.RegionSize;
107 raystart.X += differenceX * (int)Constants.RegionSize; 107 raystart.X += differenceX * (int)Constants.RegionSize;
@@ -126,8 +126,8 @@ namespace OpenSim.Region.RegionCombinerModule
126 PrimitiveBaseShape shape, byte bypassraycast, Vector3 raystart, UUID raytargetid, 126 PrimitiveBaseShape shape, byte bypassraycast, Vector3 raystart, UUID raytargetid,
127 byte rayendisintersection) 127 byte rayendisintersection)
128 { 128 {
129 int differenceX = (int)m_virtScene.RegionInfo.LegacyRegionLocX - (int)m_rootScene.RegionInfo.LegacyRegionLocX; 129 int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
130 int differenceY = (int)m_virtScene.RegionInfo.LegacyRegionLocY - (int)m_rootScene.RegionInfo.LegacyRegionLocY; 130 int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
131 rayend.X += differenceX * (int)Constants.RegionSize; 131 rayend.X += differenceX * (int)Constants.RegionSize;
132 rayend.Y += differenceY * (int)Constants.RegionSize; 132 rayend.Y += differenceY * (int)Constants.RegionSize;
133 raystart.X += differenceX * (int)Constants.RegionSize; 133 raystart.X += differenceX * (int)Constants.RegionSize;
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 3f835a4..7127c73 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -246,8 +246,8 @@ namespace OpenSim.Region.RegionCombinerModule
246 newConn.RegionScene = scene; 246 newConn.RegionScene = scene;
247 newConn.RegionLandChannel = scene.LandChannel; 247 newConn.RegionLandChannel = scene.LandChannel;
248 newConn.RegionId = scene.RegionInfo.originRegionID; 248 newConn.RegionId = scene.RegionInfo.originRegionID;
249 newConn.X = scene.RegionInfo.LegacyRegionLocX; 249 newConn.X = scene.RegionInfo.RegionLocX;
250 newConn.Y = scene.RegionInfo.LegacyRegionLocY; 250 newConn.Y = scene.RegionInfo.RegionLocY;
251 newConn.XEnd = (int)Constants.RegionSize; 251 newConn.XEnd = (int)Constants.RegionSize;
252 newConn.YEnd = (int)Constants.RegionSize; 252 newConn.YEnd = (int)Constants.RegionSize;
253 253
@@ -502,11 +502,11 @@ namespace OpenSim.Region.RegionCombinerModule
502 502
503 lock (scene.WestBorders) 503 lock (scene.WestBorders)
504 { 504 {
505 scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocX - rootConn.RegionScene.RegionInfo.LegacyRegionLocX) * (int)Constants.RegionSize); //auto teleport West 505 scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocX - rootConn.RegionScene.RegionInfo.RegionLocX) * (int)Constants.RegionSize); //auto teleport West
506 506
507 // Trigger auto teleport to root region 507 // Trigger auto teleport to root region
508 scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; 508 scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX;
509 scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; 509 scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY;
510 } 510 }
511 511
512 // Reset Terrain.. since terrain loads before we get here, we need to load 512 // Reset Terrain.. since terrain loads before we get here, we need to load
@@ -564,9 +564,9 @@ namespace OpenSim.Region.RegionCombinerModule
564 564
565 lock (scene.SouthBorders) 565 lock (scene.SouthBorders)
566 { 566 {
567 scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocY - rootConn.RegionScene.RegionInfo.LegacyRegionLocY) * (int)Constants.RegionSize); //auto teleport south 567 scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocY - rootConn.RegionScene.RegionInfo.RegionLocY) * (int)Constants.RegionSize); //auto teleport south
568 scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; 568 scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX;
569 scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; 569 scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY;
570 } 570 }
571 571
572 // Reset Terrain.. since terrain normally loads first. 572 // Reset Terrain.. since terrain normally loads first.
@@ -636,9 +636,9 @@ namespace OpenSim.Region.RegionCombinerModule
636 636
637 lock (scene.SouthBorders) 637 lock (scene.SouthBorders)
638 { 638 {
639 scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocY - rootConn.RegionScene.RegionInfo.LegacyRegionLocY) * (int)Constants.RegionSize); //auto teleport south 639 scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocY - rootConn.RegionScene.RegionInfo.RegionLocY) * (int)Constants.RegionSize); //auto teleport south
640 scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; 640 scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX;
641 scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; 641 scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY;
642 } 642 }
643 643
644 lock (rootConn.RegionScene.EastBorders) 644 lock (rootConn.RegionScene.EastBorders)
@@ -657,9 +657,9 @@ namespace OpenSim.Region.RegionCombinerModule
657 657
658 lock (scene.WestBorders) 658 lock (scene.WestBorders)
659 { 659 {
660 scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocX - rootConn.RegionScene.RegionInfo.LegacyRegionLocX) * (int)Constants.RegionSize); //auto teleport West 660 scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocX - rootConn.RegionScene.RegionInfo.RegionLocX) * (int)Constants.RegionSize); //auto teleport West
661 scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; 661 scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX;
662 scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; 662 scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY;
663 } 663 }
664 664
665 /* 665 /*
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f46bdf3..6861865 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4244,7 +4244,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4244 DataserverPlugin.RegisterRequest(m_host.LocalId, 4244 DataserverPlugin.RegisterRequest(m_host.LocalId,
4245 m_item.ItemID, item.AssetID.ToString()); 4245 m_item.ItemID, item.AssetID.ToString());
4246 4246
4247 Vector3 region = new Vector3(World.RegionInfo.RegionWorldLocX, World.RegionInfo.RegionWorldLocY, 0); 4247 Vector3 region = new Vector3(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 0);
4248 4248
4249 World.AssetService.Get(item.AssetID.ToString(), this, 4249 World.AssetService.Get(item.AssetID.ToString(), this,
4250 delegate(string i, object sender, AssetBase a) 4250 delegate(string i, object sender, AssetBase a)
@@ -5478,7 +5478,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5478 public LSL_Vector llGetRegionCorner() 5478 public LSL_Vector llGetRegionCorner()
5479 { 5479 {
5480 m_host.AddScriptLPS(1); 5480 m_host.AddScriptLPS(1);
5481 return new LSL_Vector(World.RegionInfo.RegionWorldLocX, World.RegionInfo.RegionWorldLocY, 0); 5481 return new LSL_Vector(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 0);
5482 } 5482 }
5483 5483
5484 /// <summary> 5484 /// <summary>
@@ -5651,8 +5651,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5651 5651
5652 List<GridRegion> neighbors = World.GridService.GetNeighbours(World.RegionInfo.ScopeID, World.RegionInfo.RegionID); 5652 List<GridRegion> neighbors = World.GridService.GetNeighbours(World.RegionInfo.ScopeID, World.RegionInfo.RegionID);
5653 5653
5654 uint neighborX = World.RegionInfo.LegacyRegionLocX + (uint)dir.x; 5654 uint neighborX = World.RegionInfo.RegionLocX + (uint)dir.x;
5655 uint neighborY = World.RegionInfo.LegacyRegionLocY + (uint)dir.y; 5655 uint neighborY = World.RegionInfo.RegionLocY + (uint)dir.y;
5656 5656
5657 foreach (GridRegion sri in neighbors) 5657 foreach (GridRegion sri in neighbors)
5658 { 5658 {
@@ -10767,7 +10767,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10767 httpHeaders["X-SecondLife-Shard"] = shard; 10767 httpHeaders["X-SecondLife-Shard"] = shard;
10768 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; 10768 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
10769 httpHeaders["X-SecondLife-Object-Key"] = m_host.UUID.ToString(); 10769 httpHeaders["X-SecondLife-Object-Key"] = m_host.UUID.ToString();
10770 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.LegacyRegionLocX, regionInfo.LegacyRegionLocY); 10770 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY);
10771 httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z); 10771 httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z);
10772 httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z); 10772 httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z);
10773 httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W); 10773 httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W);
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index 71334ee..b999509 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -201,8 +201,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
201 NameValueCollection requestArgs = new NameValueCollection 201 NameValueCollection requestArgs = new NameValueCollection
202 { 202 {
203 { "RequestMethod", "xAddMapTile" }, 203 { "RequestMethod", "xAddMapTile" },
204 { "X", scene.RegionInfo.LegacyRegionLocX.ToString() }, 204 { "X", scene.RegionInfo.RegionLocX.ToString() },
205 { "Y", scene.RegionInfo.LegacyRegionLocY.ToString() }, 205 { "Y", scene.RegionInfo.RegionLocY.ToString() },
206 { "ContentType", "image/png" }, 206 { "ContentType", "image/png" },
207 { "EncodedData", System.Convert.ToBase64String(pngData) } 207 { "EncodedData", System.Convert.ToBase64String(pngData) }
208 }; 208 };
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index e1a3cef..df2b4d7 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -255,8 +255,8 @@ namespace OpenSim.Services.Interfaces
255 public GridRegion(RegionInfo ConvertFrom) 255 public GridRegion(RegionInfo ConvertFrom)
256 { 256 {
257 m_regionName = ConvertFrom.RegionName; 257 m_regionName = ConvertFrom.RegionName;
258 m_regionLocX = (int)(ConvertFrom.RegionWorldLocX); 258 m_regionLocX = (int)(ConvertFrom.WorldLocX);
259 m_regionLocY = (int)(ConvertFrom.RegionWorldLocY); 259 m_regionLocY = (int)(ConvertFrom.WorldLocY);
260 RegionSizeX = (int)ConvertFrom.RegionSizeX; 260 RegionSizeX = (int)ConvertFrom.RegionSizeX;
261 RegionSizeY = (int)ConvertFrom.RegionSizeY; 261 RegionSizeY = (int)ConvertFrom.RegionSizeY;
262 m_internalEndPoint = ConvertFrom.InternalEndPoint; 262 m_internalEndPoint = ConvertFrom.InternalEndPoint;