From 56b4f5a2ea582d347c69ce30405e078270090dfa Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Thu, 1 May 2008 15:17:49 +0000
Subject: * committing what I've got so far for DuplicateOnRay so I don't fight
 the conflict monster later.   Not done yet, doesn't crash the server.

---
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 7866b32..6bd5d1a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1240,7 +1240,7 @@ namespace OpenSim.Region.Environment.Scenes
             
             LLVector3 pos = GetNewRezLocation(
                       RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), 
-                      BypassRayCast, bRayEndIsIntersection,true,scale);
+                      BypassRayCast, bRayEndIsIntersection,true,scale, false);
             
             if (!PermissionsMngr.CanRezObject(remoteClient.AgentId, pos) && !attachment)
             {
@@ -1271,7 +1271,7 @@ namespace OpenSim.Region.Environment.Scenes
                             {
                                 pos = GetNewRezLocation(
                                             RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1),
-                                               BypassRayCast, bRayEndIsIntersection, true, group.GroupScale());
+                                               BypassRayCast, bRayEndIsIntersection, true, group.GroupScale(), false);
                                 group.AbsolutePosition = pos;
                             }
                             else
-- 
cgit v1.1