diff options
author | Charles Krinke | 2008-08-27 02:40:14 +0000 |
---|---|---|
committer | Charles Krinke | 2008-08-27 02:40:14 +0000 |
commit | 84cdebe4708ee8340a93149d6cb4c266e370588d (patch) | |
tree | 6fc4ffae1668562f2775f652ee8bcc500a3adaf4 /OpenSim | |
parent | Mantis #1903 (diff) | |
download | opensim-SC-84cdebe4708ee8340a93149d6cb4c266e370588d.zip opensim-SC-84cdebe4708ee8340a93149d6cb4c266e370588d.tar.gz opensim-SC-84cdebe4708ee8340a93149d6cb4c266e370588d.tar.bz2 opensim-SC-84cdebe4708ee8340a93149d6cb4c266e370588d.tar.xz |
Mantis#2047. Thank you kindly, Simsim for a patch that addresses:
avatar sitting on the object can not telport to other regions.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 4 |
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"); |