aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-18 21:07:11 +0100
committerJustin Clark-Casey (justincc)2011-04-18 21:07:11 +0100
commit5a404a9ab1b8c684e5704efe09205f44d4a2e353 (patch)
treecf654ba76608f701b174a4b305dc393bf81dcaec /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-5a404a9ab1b8c684e5704efe09205f44d4a2e353.zip
opensim-SC_OLD-5a404a9ab1b8c684e5704efe09205f44d4a2e353.tar.gz
opensim-SC_OLD-5a404a9ab1b8c684e5704efe09205f44d4a2e353.tar.bz2
opensim-SC_OLD-5a404a9ab1b8c684e5704efe09205f44d4a2e353.tar.xz
Fix bug where objects were being coalesced in the wrong positions.
This addresses http://opensimulator.org/mantis/view.php?id=5441 The bug was due to a pre-existing mistake in creating the inventory stored position
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e030ba1..326ef28 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -269,9 +269,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
269 ? 250 269 ? 250
270 : objectGroup.AbsolutePosition.X) 270 : objectGroup.AbsolutePosition.X)
271 , 271 ,
272 (objectGroup.AbsolutePosition.X > (int)Constants.RegionSize) 272 (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
273 ? 250 273 ? 250
274 : objectGroup.AbsolutePosition.X, 274 : objectGroup.AbsolutePosition.Y,
275 objectGroup.AbsolutePosition.Z); 275 objectGroup.AbsolutePosition.Z);
276 276
277 originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition; 277 originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;