diff options
author | Diva Canto | 2010-01-16 08:42:20 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-16 08:42:20 -0800 |
commit | ee1fb81376041f6eef27bbb3e84b56ae6e2357b3 (patch) | |
tree | 699da2a087254b95c591069fe76f1d67b579c1e5 /OpenSim/Region/CoreModules/Framework | |
parent | Fixed a missing field in the last regions table migration. (diff) | |
download | opensim-SC_OLD-ee1fb81376041f6eef27bbb3e84b56ae6e2357b3.zip opensim-SC_OLD-ee1fb81376041f6eef27bbb3e84b56ae6e2357b3.tar.gz opensim-SC_OLD-ee1fb81376041f6eef27bbb3e84b56ae6e2357b3.tar.bz2 opensim-SC_OLD-ee1fb81376041f6eef27bbb3e84b56ae6e2357b3.tar.xz |
Finished moving object crossings into EntityTransferModule
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 44d3858..25415af 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -339,7 +339,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
339 | m_aScene.SimulationService.UpdateAgent(reg, agent); | 339 | m_aScene.SimulationService.UpdateAgent(reg, agent); |
340 | 340 | ||
341 | m_log.DebugFormat( | 341 | m_log.DebugFormat( |
342 | "[ENTITY TRANSFER MODULE]: Sending new ENTITY TRANSFER MODULE seed url {0} to client {1}", capsPath, sp.UUID); | 342 | "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID); |
343 | 343 | ||
344 | 344 | ||
345 | if (eq != null) | 345 | if (eq != null) |
@@ -745,7 +745,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
745 | "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort | 745 | "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort |
746 | + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; | 746 | + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; |
747 | 747 | ||
748 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new ENTITY TRANSFER MODULE seed url {0} to client {1}", capsPath, agent.UUID); | 748 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); |
749 | 749 | ||
750 | IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>(); | 750 | IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>(); |
751 | if (eq != null) | 751 | if (eq != null) |
@@ -1046,7 +1046,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1046 | 1046 | ||
1047 | eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID); | 1047 | eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID); |
1048 | eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); | 1048 | eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); |
1049 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new ENTITY TRANSFER MODULE seed url {0} to client {1} in region {2}", | 1049 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1} in region {2}", |
1050 | capsPath, sp.UUID, sp.Scene.RegionInfo.RegionName); | 1050 | capsPath, sp.UUID, sp.Scene.RegionInfo.RegionName); |
1051 | } | 1051 | } |
1052 | else | 1052 | else |