From 84cdebe4708ee8340a93149d6cb4c266e370588d Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Wed, 27 Aug 2008 02:40:14 +0000
Subject: Mantis#2047. Thank you kindly, Simsim for a patch that addresses:
 avatar sitting on the object can not telport to other regions.

---
 OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim')

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
 
                     if (destRegionUp)
                     {
+                        // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
+                        // both regions
+                        if (avatar.ParentID != (uint)0)
+                            avatar.StandUp();
                         if(!avatar.ValidateAttachments())
                         {
                             avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state");
-- 
cgit v1.1