aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Hypergrid
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-22 17:51:47 +0000
committerJustin Clarke Casey2009-01-22 17:51:47 +0000
commit8a24f61acd4623c9a78c9dca41ed7c0fddcdabc7 (patch)
tree0b6c78aebcde6fbf99936439b4dd839765fbbd23 /OpenSim/Region/Environment/Scenes/Hypergrid
parentwhite space & formatting cleanup (diff)
downloadopensim-SC_OLD-8a24f61acd4623c9a78c9dca41ed7c0fddcdabc7.zip
opensim-SC_OLD-8a24f61acd4623c9a78c9dca41ed7c0fddcdabc7.tar.gz
opensim-SC_OLD-8a24f61acd4623c9a78c9dca41ed7c0fddcdabc7.tar.bz2
opensim-SC_OLD-8a24f61acd4623c9a78c9dca41ed7c0fddcdabc7.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Hypergrid')
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs2
1 files changed, 1 insertions, 1 deletions
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
149 149
150 if (destRegionUp) 150 if (destRegionUp)
151 { 151 {
152
153 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from 152 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
154 // both regions 153 // both regions
155 if (avatar.ParentID != (uint)0) 154 if (avatar.ParentID != (uint)0)
156 avatar.StandUp(); 155 avatar.StandUp();
156
157 if (!avatar.ValidateAttachments()) 157 if (!avatar.ValidateAttachments())
158 { 158 {
159 avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state"); 159 avatar.ControllingClient.SendTeleportFailed("Inconsistent attachment state");