diff options
author | Diva Canto | 2010-12-11 17:06:17 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-11 17:06:17 -0800 |
commit | 797ca8d0e787b20fdd0794f2017268f6e5b175e6 (patch) | |
tree | fb528297ffdc57154775cca19b47b06bdbaae5b0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Revert "Another stab at mantis #5256" (diff) | |
download | opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.zip opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.tar.gz opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.tar.bz2 opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.tar.xz |
Fixes the nudge movements!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a1c80e5..f64d539 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2225,33 +2225,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2225 | { | 2225 | { |
2226 | // WHAT??? | 2226 | // WHAT??? |
2227 | m_log.Debug("[SCENEPRESENCE]: AddNewMovement() called on child agent, making root agent!"); | 2227 | m_log.Debug("[SCENEPRESENCE]: AddNewMovement() called on child agent, making root agent!"); |
2228 | |||
2229 | // we have to reset the user's child agent connections. | ||
2230 | // Likely, here they've lost the eventqueue for other regions so border | ||
2231 | // crossings will fail at this point unless we reset them. | ||
2232 | |||
2233 | List<ulong> regions = new List<ulong>(KnownChildRegionHandles); | ||
2234 | regions.Remove(m_scene.RegionInfo.RegionHandle); | ||
2235 | |||
2236 | MakeRootAgent(new Vector3(127f, 127f, 127f), true); | ||
2237 | |||
2238 | // Async command | ||
2239 | if (m_scene.SceneGridService != null) | ||
2240 | { | ||
2241 | m_scene.SceneGridService.SendCloseChildAgentConnections(UUID, regions); | ||
2242 | |||
2243 | // Give the above command some time to try and close the connections. | ||
2244 | // this is really an emergency.. so sleep, or we'll get all discombobulated. | ||
2245 | System.Threading.Thread.Sleep(500); | ||
2246 | } | ||
2247 | |||
2248 | if (m_scene.SceneGridService != null) | ||
2249 | { | ||
2250 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); | ||
2251 | if (m_agentTransfer != null) | ||
2252 | m_agentTransfer.EnableChildAgents(this); | ||
2253 | } | ||
2254 | |||
2255 | return; | 2228 | return; |
2256 | } | 2229 | } |
2257 | 2230 | ||