diff options
| author | UbitUmarov | 2016-07-30 04:31:26 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-30 04:31:26 +0100 |
| commit | 22b1b915991eb507399ba7d6f5bcb31464156115 (patch) | |
| tree | 37db37e0b2cec4bf3c6f621c5f4ee03e9eb507eb /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix cAgent.CrossingFlags (diff) | |
| download | opensim-SC-22b1b915991eb507399ba7d6f5bcb31464156115.zip opensim-SC-22b1b915991eb507399ba7d6f5bcb31464156115.tar.gz opensim-SC-22b1b915991eb507399ba7d6f5bcb31464156115.tar.bz2 opensim-SC-22b1b915991eb507399ba7d6f5bcb31464156115.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7c1a7631..c592385 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4539,7 +4539,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4539 | if (Scene.AttachmentsModule != null) | 4539 | if (Scene.AttachmentsModule != null) |
| 4540 | Scene.AttachmentsModule.CopyAttachments(this, cAgent); | 4540 | Scene.AttachmentsModule.CopyAttachments(this, cAgent); |
| 4541 | 4541 | ||
| 4542 | cAgent.CrossingFlags = isCrossUpdate ? crossingFlags : (byte)0; | 4542 | if(isCrossUpdate) |
| 4543 | { | ||
| 4544 | cAgent.CrossingFlags = crossingFlags; | ||
| 4545 | cAgent.CrossingFlags |= 1; | ||
| 4546 | } | ||
| 4547 | else | ||
| 4548 | cAgent.CrossingFlags = 0; | ||
| 4543 | 4549 | ||
| 4544 | if(isCrossUpdate && haveGroupInformation) | 4550 | if(isCrossUpdate && haveGroupInformation) |
| 4545 | { | 4551 | { |