diff options
| author | Diva Canto | 2012-04-27 09:26:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-04-27 09:26:14 -0700 |
| commit | 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch) | |
| tree | e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | Minor change in error message (HG teleport failures) (diff) | |
| parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
| download | opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 85e7e94..90f27c4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
| @@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 191 | { | 191 | { |
| 192 | if (s.RegionInfo.RegionHandle == destination.RegionHandle) | 192 | if (s.RegionInfo.RegionHandle == destination.RegionHandle) |
| 193 | { | 193 | { |
| 194 | m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName); | 194 | // m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName); |
| 195 | return s.NewUserConnection(aCircuit, teleportFlags, out reason); | 195 | return s.NewUserConnection(aCircuit, teleportFlags, out reason); |
| 196 | } | 196 | } |
| 197 | } | 197 | } |
| @@ -209,9 +209,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 209 | { | 209 | { |
| 210 | if (s.RegionInfo.RegionHandle == destination.RegionHandle) | 210 | if (s.RegionInfo.RegionHandle == destination.RegionHandle) |
| 211 | { | 211 | { |
| 212 | m_log.DebugFormat( | 212 | // m_log.DebugFormat( |
| 213 | "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", | 213 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", |
| 214 | s.RegionInfo.RegionName, destination.RegionHandle); | 214 | // s.RegionInfo.RegionName, destination.RegionHandle); |
| 215 | 215 | ||
| 216 | s.IncomingChildAgentDataUpdate(cAgentData); | 216 | s.IncomingChildAgentDataUpdate(cAgentData); |
| 217 | return true; | 217 | return true; |
| @@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
| 281 | { | 281 | { |
| 282 | if (s.RegionInfo.RegionID == origin) | 282 | if (s.RegionInfo.RegionID == origin) |
| 283 | { | 283 | { |
| 284 | m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent"); | 284 | // m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent"); |
| 285 | AgentTransferModule.AgentArrivedAtDestination(id); | 285 | AgentTransferModule.AgentArrivedAtDestination(id); |
| 286 | return true; | 286 | return true; |
| 287 | // return s.IncomingReleaseAgent(id); | 287 | // return s.IncomingReleaseAgent(id); |