aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMW2009-07-13 12:08:14 +0000
committerMW2009-07-13 12:08:14 +0000
commita7043ebf53fc469af79877dfb1cde4c3588c969e (patch)
treedff3d841672c1f9b8a766cfe68736e297189d020 /OpenSim/Region/CoreModules
parentFixed bug in AvatarCreationModule, where during the cloning of a folder it wo... (diff)
downloadopensim-SC-a7043ebf53fc469af79877dfb1cde4c3588c969e.zip
opensim-SC-a7043ebf53fc469af79877dfb1cde4c3588c969e.tar.gz
opensim-SC-a7043ebf53fc469af79877dfb1cde4c3588c969e.tar.bz2
opensim-SC-a7043ebf53fc469af79877dfb1cde4c3588c969e.tar.xz
Attempt to make it so items rezzed from inventory aren't half in the ground or half in the prim they are being rezzed on top off. This is currently only correct for single prims (not link groups) and unrotated prims. Next step is to fix for link sets and rotated prims.
This needs a lot more testing to find use cases where it might be wrong (like half way up a hill?)
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index d8c7b84..63a93aa 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -303,7 +303,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
303 if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos)) 303 if (m_scene.Permissions.CanRezObject(1, avatar.UUID, pos))
304 { 304 {
305 // rez ON the ground, not IN the ground 305 // rez ON the ground, not IN the ground
306 pos.Z += 0.25F; 306 // pos.Z += 0.25F;
307 307
308 obj = m_scene.AddNewPrim(avatar.UUID, group_id, pos, rotation, pbs); 308 obj = m_scene.AddNewPrim(avatar.UUID, group_id, pos, rotation, pbs);
309 } 309 }