aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2010-10-07 01:13:17 +0200
committerMelanie2011-04-03 20:24:44 +0100
commitb385d4aa036ad7bf58d033a9923452535c82ef69 (patch)
treefd6511be9df96c1504dbfa3e1308d5e708542daf /OpenSim/Region/Framework/Scenes/Scene.cs
parentMake CHANGED_OWNER work for deeding and god-mode in-world change (diff)
downloadopensim-SC_OLD-b385d4aa036ad7bf58d033a9923452535c82ef69.zip
opensim-SC_OLD-b385d4aa036ad7bf58d033a9923452535c82ef69.tar.gz
opensim-SC_OLD-b385d4aa036ad7bf58d033a9923452535c82ef69.tar.bz2
opensim-SC_OLD-b385d4aa036ad7bf58d033a9923452535c82ef69.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 353b7c2..35a798e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4865,8 +4865,17 @@ namespace OpenSim.Region.Framework.Scenes
4865 { 4865 {
4866 float ominX, ominY, ominZ, omaxX, omaxY, omaxZ; 4866 float ominX, ominY, ominZ, omaxX, omaxY, omaxZ;
4867 4867
4868 Vector3 vec = g.AbsolutePosition;
4869
4868 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ); 4870 g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ);
4869 4871
4872 ominX += vec.X;
4873 omaxX += vec.X;
4874 ominY += vec.Y;
4875 omaxY += vec.Y;
4876 ominZ += vec.Z;
4877 omaxZ += vec.Z;
4878
4870 if (minX > ominX) 4879 if (minX > ominX)
4871 minX = ominX; 4880 minX = ominX;
4872 if (minY > ominY) 4881 if (minY > ominY)