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/Scene.Inventory.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/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b45cc4d..4ab5a4a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2221,14 +2221,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2221 | itemID = UUID.Zero; | 2221 | itemID = UUID.Zero; |
| 2222 | if (grp != null) | 2222 | if (grp != null) |
| 2223 | { | 2223 | { |
| 2224 | Vector3 inventoryStoredPosition = new Vector3 | 2224 | Vector3 inventoryStoredPosition = new Vector3( |
| 2225 | (((grp.AbsolutePosition.X > (int)Constants.RegionSize) | 2225 | Math.Min(grp.AbsolutePosition.X, RegionInfo.RegionSizeX - 6), |
| 2226 | ? 250 | 2226 | Math.Min(grp.AbsolutePosition.Y, RegionInfo.RegionSizeY - 6), |
| 2227 | : grp.AbsolutePosition.X) | ||
| 2228 | , | ||
| 2229 | (grp.AbsolutePosition.X > (int)Constants.RegionSize) | ||
| 2230 | ? 250 | ||
| 2231 | : grp.AbsolutePosition.X, | ||
| 2232 | grp.AbsolutePosition.Z); | 2227 | grp.AbsolutePosition.Z); |
| 2233 | 2228 | ||
| 2234 | Vector3 originalPosition = grp.AbsolutePosition; | 2229 | Vector3 originalPosition = grp.AbsolutePosition; |