From 8a24f61acd4623c9a78c9dca41ed7c0fddcdabc7 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 22 Jan 2009 17:51:47 +0000 Subject: * Change the currently misleading log message when capabilities are added twice, and provide some more information * No functional change * It strikes me that there may be caps problems if double registration is presented if cleanup failed for a previous agent (so a caps handler will remain in memory for that agent but with a different seed). This needs investigation --- .../Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 76d1cba..5e3e03f 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -149,11 +149,11 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid 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