diff options
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/MessageService.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 9ab0413..32b7554 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -582,12 +582,12 @@ namespace OpenSim.Grid.GridServer | |||
582 | { | 582 | { |
583 | if ( | 583 | if ( |
584 | GetRegion( | 584 | GetRegion( |
585 | Utils.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), | 585 | Helpers.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), |
586 | (uint)(sim.regionLocY + y) * Constants.RegionSize)) != null) | 586 | (uint)(sim.regionLocY + y) * Constants.RegionSize)) != null) |
587 | { | 587 | { |
588 | neighbour = | 588 | neighbour = |
589 | GetRegion( | 589 | GetRegion( |
590 | Utils.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), | 590 | Helpers.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), |
591 | (uint)(sim.regionLocY + y) * Constants.RegionSize)); | 591 | (uint)(sim.regionLocY + y) * Constants.RegionSize)); |
592 | 592 | ||
593 | NeighbourBlock = new Hashtable(); | 593 | NeighbourBlock = new Hashtable(); |
@@ -675,7 +675,7 @@ namespace OpenSim.Grid.GridServer | |||
675 | } | 675 | } |
676 | catch (KeyNotFoundException) { } | 676 | catch (KeyNotFoundException) { } |
677 | 677 | ||
678 | sim.regionHandle = Utils.UIntsToLong((sim.regionLocX * Constants.RegionSize), (sim.regionLocY * Constants.RegionSize)); | 678 | sim.regionHandle = Helpers.UIntsToLong((sim.regionLocX * Constants.RegionSize), (sim.regionLocY * Constants.RegionSize)); |
679 | sim.serverURI = (string)requestData["server_uri"]; | 679 | sim.serverURI = (string)requestData["server_uri"]; |
680 | 680 | ||
681 | sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/"; | 681 | sim.httpServerURI = "http://" + sim.serverIP + ":" + sim.httpPort + "/"; |
@@ -894,7 +894,7 @@ namespace OpenSim.Grid.GridServer | |||
894 | { | 894 | { |
895 | for (int y = ymin; y < ymax + 1; y++) | 895 | for (int y = ymin; y < ymax + 1; y++) |
896 | { | 896 | { |
897 | ulong regHandle = Utils.UIntsToLong((uint)(x * Constants.RegionSize), (uint)(y * Constants.RegionSize)); | 897 | ulong regHandle = Helpers.UIntsToLong((uint)(x * Constants.RegionSize), (uint)(y * Constants.RegionSize)); |
898 | simProfile = GetRegion(regHandle); | 898 | simProfile = GetRegion(regHandle); |
899 | if (simProfile != null) | 899 | if (simProfile != null) |
900 | { | 900 | { |
@@ -1124,12 +1124,12 @@ namespace OpenSim.Grid.GridServer | |||
1124 | 1124 | ||
1125 | case "region_locx": | 1125 | case "region_locx": |
1126 | theSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); | 1126 | theSim.regionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); |
1127 | theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); | 1127 | theSim.regionHandle = Helpers.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); |
1128 | break; | 1128 | break; |
1129 | 1129 | ||
1130 | case "region_locy": | 1130 | case "region_locy": |
1131 | theSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); | 1131 | theSim.regionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); |
1132 | theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); | 1132 | theSim.regionHandle = Helpers.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); |
1133 | break; | 1133 | break; |
1134 | } | 1134 | } |
1135 | } | 1135 | } |
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 1f04865..b4a0c21 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
@@ -484,7 +484,7 @@ namespace OpenSim.Grid.MessagingServer | |||
484 | regionProfile = new RegionProfileData(); | 484 | regionProfile = new RegionProfileData(); |
485 | regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); | 485 | regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); |
486 | regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; | 486 | regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; |
487 | regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); | 487 | regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); |
488 | regionProfile.regionLocX = regX; | 488 | regionProfile.regionLocX = regX; |
489 | regionProfile.regionLocY = regY; | 489 | regionProfile.regionLocY = regY; |
490 | 490 | ||