aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 4823aa1..6aa6de8 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -615,6 +615,10 @@ namespace OpenSim.Region.Environment.Scenes
615 615
616 if (destRegionUp) 616 if (destRegionUp)
617 { 617 {
618 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
619 // both regions
620 if (avatar.ParentID != (uint)0)
621 avatar.StandUp();
618 if(!avatar.ValidateAttachments()) 622 if(!avatar.ValidateAttachments())
619 { 623 {
620 avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); 624 avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state");