aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-08-05 15:19:42 +0100
committerUbitUmarov2016-08-05 15:19:42 +0100
commit23578635df0c98f883f7be9b6e08a4fc1a7c834c (patch)
tree4d35657b01a00ce867c526157a3df592de4b7098 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentalso use group provided by viewer on ObjectDuplicateOnRay (diff)
downloadopensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.zip
opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.tar.gz
opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.tar.bz2
opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.tar.xz
more changes relative to incorrect use of activegroupid
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f2df364..7152015 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2454,6 +2454,7 @@ namespace OpenSim.Region.Framework.Scenes
2454 /// </summary> 2454 /// </summary>
2455 /// <param name="remoteClient"></param> 2455 /// <param name="remoteClient"></param>
2456 /// <param name="itemID"></param> 2456 /// <param name="itemID"></param>
2457 /// <param name="groupID"></param>
2457 /// <param name="RayEnd"></param> 2458 /// <param name="RayEnd"></param>
2458 /// <param name="RayStart"></param> 2459 /// <param name="RayStart"></param>
2459 /// <param name="RayTargetID"></param> 2460 /// <param name="RayTargetID"></param>
@@ -2464,7 +2465,8 @@ namespace OpenSim.Region.Framework.Scenes
2464 /// <param name="RezSelected"></param> 2465 /// <param name="RezSelected"></param>
2465 /// <param name="RemoveItem"></param> 2466 /// <param name="RemoveItem"></param>
2466 /// <param name="fromTaskID"></param> 2467 /// <param name="fromTaskID"></param>
2467 public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, 2468 public virtual void RezObject(IClientAPI remoteClient, UUID itemID, UUID groupID,
2469 Vector3 RayEnd, Vector3 RayStart,
2468 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 2470 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
2469 bool RezSelected, bool RemoveItem, UUID fromTaskID) 2471 bool RezSelected, bool RemoveItem, UUID fromTaskID)
2470 { 2472 {
@@ -2504,8 +2506,7 @@ namespace OpenSim.Region.Framework.Scenes
2504 2506
2505 byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0); 2507 byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
2506 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f); 2508 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
2507 Vector3 pos 2509 Vector3 pos = GetNewRezLocation(
2508 = GetNewRezLocation(
2509 RayStart, RayEnd, RayTargetID, Quaternion.Identity, 2510 RayStart, RayEnd, RayTargetID, Quaternion.Identity,
2510 BypassRayCast, bRayEndIsIntersection, true, scale, false); 2511 BypassRayCast, bRayEndIsIntersection, true, scale, false);
2511 2512