aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-20 01:48:51 +0000
committerMelanie Thielker2008-08-20 01:48:51 +0000
commitf206ffd5a8cd0ef362e972abf7375eb739f82e5b (patch)
treee05c17a865f02beecddbe2c9c04705bc08c03db1 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
parentRemove trailing whitespace in prebuild.xml. (diff)
downloadopensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.zip
opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.tar.gz
opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.tar.bz2
opensim-SC_OLD-f206ffd5a8cd0ef362e972abf7375eb739f82e5b.tar.xz
Mantis #2003 - thank you, SachaMagne, for a patch that implements
the first part of gesture persistence. ---------------------------------------------------------- Attachments no longer vanish on walking crossing. Teleport is still problematic, but will now be blocked with message "Inconsistent attachment state" rather than losing the attachment. Detach to be able to TP in that case.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index f1af15f..4823aa1 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -615,6 +615,12 @@ namespace OpenSim.Region.Environment.Scenes
615 615
616 if (destRegionUp) 616 if (destRegionUp)
617 { 617 {
618 if(!avatar.ValidateAttachments())
619 {
620 avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state");
621 return;
622 }
623
618 avatar.Close(); 624 avatar.Close();
619 625
620 // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport 626 // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport