aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-24 22:46:45 +0100
committerJustin Clark-Casey (justincc)2012-05-24 22:46:45 +0100
commitcc53d91d2f53adf952703f7fb91a7ab33c7a5d8a (patch)
tree137612e895f2f1b098e7ae0d2e41366b733bf0d5
parentNow that the EntityTransferModule is per-region, fetch the event queue module... (diff)
downloadopensim-SC_OLD-cc53d91d2f53adf952703f7fb91a7ab33c7a5d8a.zip
opensim-SC_OLD-cc53d91d2f53adf952703f7fb91a7ab33c7a5d8a.tar.gz
opensim-SC_OLD-cc53d91d2f53adf952703f7fb91a7ab33c7a5d8a.tar.bz2
opensim-SC_OLD-cc53d91d2f53adf952703f7fb91a7ab33c7a5d8a.tar.xz
On inter-region teleport, only stand the avatar up if the QueryAccess call to the destination scene actually succeeds.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 361e453..5afe553 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
153 { 153 {
154 if (!m_Enabled) 154 if (!m_Enabled)
155 return; 155 return;
156 156
157 m_eqModule = m_scene.RequestModuleInterface<IEventQueue>(); 157 m_eqModule = m_scene.RequestModuleInterface<IEventQueue>();
158 } 158 }
159 159
@@ -426,11 +426,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
426 return; 426 return;
427 } 427 }
428 428
429 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
430 // both regions
431 if (sp.ParentID != (uint)0)
432 sp.StandUp();
433
434 if (!sp.ValidateAttachments()) 429 if (!sp.ValidateAttachments())
435 m_log.DebugFormat( 430 m_log.DebugFormat(
436 "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for teleport of {0} from {1} to {2}. Continuing.", 431 "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for teleport of {0} from {1} to {2}. Continuing.",
@@ -457,7 +452,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
457 return; 452 return;
458 } 453 }
459 454
460 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Destination is running version {0}", version); 455 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Destination is running version {0}", version);
456
457 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
458 // both regions
459 if (sp.ParentID != (uint)0)
460 sp.StandUp();
461 461
462 sp.ControllingClient.SendTeleportStart(teleportFlags); 462 sp.ControllingClient.SendTeleportStart(teleportFlags);
463 463