aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/GridManager.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-19 06:25:34 +0000
committerMelanie Thielker2008-11-19 06:25:34 +0000
commitf518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch)
tree8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Grid/GridServer/GridManager.cs
parentReverting the texture sending patch and the new libOMV. This makes this (diff)
downloadopensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 32b7554..9ab0413 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 Helpers.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), 585 Utils.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 Helpers.UIntsToLong((uint)((sim.regionLocX + x) * Constants.RegionSize), 590 Utils.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 = Helpers.UIntsToLong((sim.regionLocX * Constants.RegionSize), (sim.regionLocY * Constants.RegionSize)); 678 sim.regionHandle = Utils.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 = Helpers.UIntsToLong((uint)(x * Constants.RegionSize), (uint)(y * Constants.RegionSize)); 897 ulong regHandle = Utils.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 = Helpers.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); 1127 theSim.regionHandle = Utils.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 = Helpers.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize)); 1132 theSim.regionHandle = Utils.UIntsToLong((theSim.regionLocX * Constants.RegionSize), (theSim.regionLocY * Constants.RegionSize));
1133 break; 1133 break;
1134 } 1134 }
1135 } 1135 }