aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-10-07 01:13:17 +0200
committerMelanie2010-10-07 01:13:17 +0200
commit2db0ac74c72f18d1bceb15b8a368777e42b366c0 (patch)
tree874f9c1eaa17855e0dd6f07ea50efa0326647a16 /OpenSim/Region/Framework/Scenes/Scene.cs
parentPlumb the path for multiple object deletes (diff)
downloadopensim-SC-2db0ac74c72f18d1bceb15b8a368777e42b366c0.zip
opensim-SC-2db0ac74c72f18d1bceb15b8a368777e42b366c0.tar.gz
opensim-SC-2db0ac74c72f18d1bceb15b8a368777e42b366c0.tar.bz2
opensim-SC-2db0ac74c72f18d1bceb15b8a368777e42b366c0.tar.xz
Implement taking of coalesced objects.
WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index bcc439c..76e160d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5063,8 +5063,17 @@ namespace OpenSim.Region.Framework.Scenes
5063 { 5063 {
5064 float ominX, ominY, ominZ, omaxX, omaxY, omaxZ; 5064 float ominX, ominY, ominZ, omaxX, omaxY, omaxZ;
5065 5065
5066 Vector3 vec = g.AbsolutePosition;
5067
5066 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ); 5068 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ);
5067 5069
5070 ominX += vec.X;
5071 omaxX += vec.X;
5072 ominY += vec.Y;
5073 omaxY += vec.Y;
5074 ominZ += vec.Z;
5075 omaxZ += vec.Z;
5076
5068 if (minX > ominX) 5077 if (minX > ominX)
5069 minX = ominX; 5078 minX = ominX;
5070 if (minY > ominY) 5079 if (minY > ominY)