aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTleiades Hax2007-10-21 09:32:24 +0000
committerTleiades Hax2007-10-21 09:32:24 +0000
commit9f2fcfb3ec5b46b5e62e4fb0aa23cbfc6ae413f0 (patch)
tree9cd7259bcf108c1696c0f1c5fb49b277fdadd1f9
parentlibraries moved to opensim-libs, a new repository (diff)
downloadopensim-SC_OLD-9f2fcfb3ec5b46b5e62e4fb0aa23cbfc6ae413f0.zip
opensim-SC_OLD-9f2fcfb3ec5b46b5e62e4fb0aa23cbfc6ae413f0.tar.gz
opensim-SC_OLD-9f2fcfb3ec5b46b5e62e4fb0aa23cbfc6ae413f0.tar.bz2
opensim-SC_OLD-9f2fcfb3ec5b46b5e62e4fb0aa23cbfc6ae413f0.tar.xz
Fixed a bug causing a crash during clientlog on in Windows (Thanks to Rookiie and nebadon for laying all the ground work)
Fixed a bug, preventing standalone mode to report neighboring sims correctly
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index fdc3994..89213a4 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
85 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location"); 85 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location");
86 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2))) 86 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
87 { 87 {
88 if ((reg.RegionLocY > (x - 2)) && (reg.RegionLocY < (x + 2))) 88 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
89 { 89 {
90 neighbours.Add(reg); 90 neighbours.Add(reg);
91 } 91 }
@@ -255,3 +255,4 @@ namespace OpenSim.Region.Communications.Local
255} 255}
256 256
257 257
258
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ab94842..f7e3543 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1084,10 +1084,12 @@ namespace OpenSim.Region.Environment.Scenes
1084 /// <param name="endPoint"></param> 1084 /// <param name="endPoint"></param>
1085 private void InformClientOfNeighbourAsync(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint) 1085 private void InformClientOfNeighbourAsync(IClientAPI remoteClient, AgentCircuitData a, ulong regionHandle, IPEndPoint endPoint)
1086 { 1086 {
1087 MainLog.Instance.Notice("INTERGRID", "Starting to inform client about neighbours");
1087 bool regionAccepted = commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, a); 1088 bool regionAccepted = commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, a);
1088 1089
1089 if (regionAccepted) 1090 if (regionAccepted)
1090 remoteClient.InformClientOfNeighbour(regionHandle, endPoint); 1091 remoteClient.InformClientOfNeighbour(regionHandle, endPoint);
1092 MainLog.Instance.Notice("INTERGRID", "Completed inform client about neighbours");
1091 } 1093 }
1092 1094
1093 /// <summary> 1095 /// <summary>
@@ -1109,7 +1111,7 @@ namespace OpenSim.Region.Environment.Scenes
1109 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 1111 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
1110 d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, 1112 d.BeginInvoke(remoteClient, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
1111 InformClientOfNeighbourCompleted, 1113 InformClientOfNeighbourCompleted,
1112 null); 1114 d);
1113 1115
1114 } 1116 }
1115 } 1117 }