diff options
author | MW | 2007-05-31 17:33:52 +0000 |
---|---|---|
committer | MW | 2007-05-31 17:33:52 +0000 |
commit | f4448fcd7df587604b63e45fc5bcdbaec3f579ee (patch) | |
tree | e6389bd29b50326ddc0f12afb375d95a791438ea /OpenSim/OpenSim.World/World.cs | |
parent | Another commit as ordered by robl (diff) | |
download | opensim-SC_OLD-f4448fcd7df587604b63e45fc5bcdbaec3f579ee.zip opensim-SC_OLD-f4448fcd7df587604b63e45fc5bcdbaec3f579ee.tar.gz opensim-SC_OLD-f4448fcd7df587604b63e45fc5bcdbaec3f579ee.tar.bz2 opensim-SC_OLD-f4448fcd7df587604b63e45fc5bcdbaec3f579ee.tar.xz |
After nearly a hour of searching for an annoying bug (which turned out to be a new statement one line outside the loop it should have been in)....Multi-Regions in a single instance work, there is no Grid mode communication, so it can only be tested in sandbox mode right now.
All you need to do is put .xml files for each region you want to be ran by the single server inside the "bin\Regions" folder (make sure none of the settings in those .xml files conflict with each other) and then startup the server and login, Any neighbouring regions that are being ran in the instance should show up. (However there is still no movement or anything)
Now time to refine the communications interfaces!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.World/World.cs | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index 2c5971d..1d56ea3 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs | |||
@@ -504,16 +504,22 @@ namespace OpenSim.world | |||
504 | /// </summary> | 504 | /// </summary> |
505 | protected void InformClientOfNeighbours(IClientAPI remoteClient) | 505 | protected void InformClientOfNeighbours(IClientAPI remoteClient) |
506 | { | 506 | { |
507 | // Console.WriteLine("informing client of neighbouring regions"); | ||
507 | List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); | 508 | List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); |
508 | 509 | ||
509 | 510 | //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); | |
510 | for (int i = 0; i < neighbours.Count; i++) | 511 | if (neighbours != null) |
511 | { | 512 | { |
512 | AgentCircuitData agent = remoteClient.RequestClientInfo(); | 513 | for (int i = 0; i < neighbours.Count; i++) |
513 | agent.BaseFolder = LLUUID.Zero; | 514 | { |
514 | agent.InventoryFolder = LLUUID.Zero; | 515 | // Console.WriteLine("sending neighbours data"); |
515 | agent.startpos = new LLVector3(128, 128, 70); | 516 | AgentCircuitData agent = remoteClient.RequestClientInfo(); |
516 | this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); | 517 | agent.BaseFolder = LLUUID.Zero; |
518 | agent.InventoryFolder = LLUUID.Zero; | ||
519 | agent.startpos = new LLVector3(128, 128, 70); | ||
520 | this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent); | ||
521 | remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort); | ||
522 | } | ||
517 | } | 523 | } |
518 | } | 524 | } |
519 | 525 | ||