diff options
author | Justin Clark-Casey (justincc) | 2013-03-06 23:06:00 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-06 23:06:00 +0000 |
commit | 5751ecde5250484fe8e4b79ef38bfbf441e3dead (patch) | |
tree | 769348d5952d6758aec7879ad0313389bb819aa4 /OpenSim/Region/CoreModules/Framework | |
parent | Add regression test for presence crossing between regions on the same simulator. (diff) | |
download | opensim-SC_OLD-5751ecde5250484fe8e4b79ef38bfbf441e3dead.zip opensim-SC_OLD-5751ecde5250484fe8e4b79ef38bfbf441e3dead.tar.gz opensim-SC_OLD-5751ecde5250484fe8e4b79ef38bfbf441e3dead.tar.bz2 opensim-SC_OLD-5751ecde5250484fe8e4b79ef38bfbf441e3dead.tar.xz |
Add code for testing event queue messages recevied on region cross.
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 07c3666..01b1668 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1206,6 +1206,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1206 | // region doesn't take it | 1206 | // region doesn't take it |
1207 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp); | 1207 | m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp); |
1208 | 1208 | ||
1209 | m_log.WarnFormat( | ||
1210 | "[ENTITY TRANSFER MODULE]: Region {0} would not accept update for agent {1} on cross attempt. Returning to original region.", | ||
1211 | neighbourRegion.RegionName, agent.Name); | ||
1212 | |||
1209 | ReInstantiateScripts(agent); | 1213 | ReInstantiateScripts(agent); |
1210 | agent.AddToPhysicalScene(isFlying); | 1214 | agent.AddToPhysicalScene(isFlying); |
1211 | 1215 | ||
@@ -1225,6 +1229,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1225 | neighbourRegion.RegionHandle); | 1229 | neighbourRegion.RegionHandle); |
1226 | return agent; | 1230 | return agent; |
1227 | } | 1231 | } |
1232 | |||
1228 | // No turning back | 1233 | // No turning back |
1229 | agent.IsChildAgent = true; | 1234 | agent.IsChildAgent = true; |
1230 | 1235 | ||