diff options
author | Teravus Ovares | 2007-11-27 13:46:52 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-27 13:46:52 +0000 |
commit | 082f2baebe300e1313a34444c42dcc0a20c44baf (patch) | |
tree | 71616106c7a7dc1a3e21ea14c2f4b6d09fc642a5 /OpenSim/Grid/GridServer | |
parent | MainMap workaround. Map still does not fill in automatically, but one click o... (diff) | |
download | opensim-SC-082f2baebe300e1313a34444c42dcc0a20c44baf.zip opensim-SC-082f2baebe300e1313a34444c42dcc0a20c44baf.tar.gz opensim-SC-082f2baebe300e1313a34444c42dcc0a20c44baf.tar.bz2 opensim-SC-082f2baebe300e1313a34444c42dcc0a20c44baf.tar.xz |
Fixed an event in the events chain in inter-region communications.
As a consequence, restarting sims in the same process instance now shows them when they come back up in grid mode and standalone mode.
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 2e04052..691ed57 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -350,6 +350,7 @@ namespace OpenSim.Grid.GridServer | |||
350 | NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); | 350 | NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); |
351 | NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); | 351 | NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); |
352 | NeighbourBlock["UUID"] = aSim.Value.UUID.ToString(); | 352 | NeighbourBlock["UUID"] = aSim.Value.UUID.ToString(); |
353 | NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString(); | ||
353 | 354 | ||
354 | if (aSim.Value.UUID != TheSim.UUID) | 355 | if (aSim.Value.UUID != TheSim.UUID) |
355 | SimNeighboursData.Add(NeighbourBlock); | 356 | SimNeighboursData.Add(NeighbourBlock); |
@@ -376,6 +377,7 @@ namespace OpenSim.Grid.GridServer | |||
376 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); | 377 | NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); |
377 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); | 378 | NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); |
378 | NeighbourBlock["UUID"] = neighbour.UUID.ToString(); | 379 | NeighbourBlock["UUID"] = neighbour.UUID.ToString(); |
380 | NeighbourBlock["regionHandle"] = neighbour.regionHandle.ToString(); | ||
379 | 381 | ||
380 | if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock); | 382 | if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock); |
381 | } | 383 | } |
@@ -438,6 +440,7 @@ namespace OpenSim.Grid.GridServer | |||
438 | responseData["region_locy"] = simData.regionLocY.ToString(); | 440 | responseData["region_locy"] = simData.regionLocY.ToString(); |
439 | responseData["region_UUID"] = simData.UUID.UUID.ToString(); | 441 | responseData["region_UUID"] = simData.UUID.UUID.ToString(); |
440 | responseData["region_name"] = simData.regionName; | 442 | responseData["region_name"] = simData.regionName; |
443 | responseData["regionHandle"] = simData.regionHandle.ToString(); | ||
441 | } | 444 | } |
442 | 445 | ||
443 | XmlRpcResponse response = new XmlRpcResponse(); | 446 | XmlRpcResponse response = new XmlRpcResponse(); |