diff options
| author | UbitUmarov | 2015-08-19 08:48:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-19 08:48:50 +0100 |
| commit | 0b105da626ae8c2fb519a817b827f90534ed7d08 (patch) | |
| tree | 509e6d091fb12f38fd09528335e51aeedbe59c08 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into ubitworkmaster (diff) | |
| parent | varregion: update MapImageServiceModule to upload multiple map tiles for larg... (diff) | |
| download | opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.zip opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.gz opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.bz2 opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.xz | |
Merge branch 'mbworkvar2' into ubitvar
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 91293c4..8979659 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2979,10 +2979,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2979 | { | 2979 | { |
| 2980 | Vector3 newpos = new Vector3(pa.Position.GetBytes(), 0); | 2980 | Vector3 newpos = new Vector3(pa.Position.GetBytes(), 0); |
| 2981 | 2981 | ||
| 2982 | if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | 2982 | if (!ParentGroup.Scene.PositionIsInCurrentRegion(newpos)) |
| 2983 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | ||
| 2984 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | ||
| 2985 | || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) | ||
| 2986 | { | 2983 | { |
| 2987 | ParentGroup.AbsolutePosition = newpos; | 2984 | ParentGroup.AbsolutePosition = newpos; |
| 2988 | return; | 2985 | return; |