aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-08-05 15:36:50 +0100
committerUbitUmarov2016-08-05 15:36:50 +0100
commitefb60b5b42f6adce1bd98f8b7562a397865f11fc (patch)
tree7e4530babf6ffb04c0626a9cc3b40e931959db2f /OpenSim
parent more changes relative to incorrect use of activegroupid (diff)
downloadopensim-SC_OLD-efb60b5b42f6adce1bd98f8b7562a397865f11fc.zip
opensim-SC_OLD-efb60b5b42f6adce1bd98f8b7562a397865f11fc.tar.gz
opensim-SC_OLD-efb60b5b42f6adce1bd98f8b7562a397865f11fc.tar.bz2
opensim-SC_OLD-efb60b5b42f6adce1bd98f8b7562a397865f11fc.tar.xz
use group provided by viewer on Object rez from inventory
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7152015..339fc15 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2454,7 +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="rezGroupID"></param>
2458 /// <param name="RayEnd"></param> 2458 /// <param name="RayEnd"></param>
2459 /// <param name="RayStart"></param> 2459 /// <param name="RayStart"></param>
2460 /// <param name="RayTargetID"></param> 2460 /// <param name="RayTargetID"></param>
@@ -2465,7 +2465,7 @@ namespace OpenSim.Region.Framework.Scenes
2465 /// <param name="RezSelected"></param> 2465 /// <param name="RezSelected"></param>
2466 /// <param name="RemoveItem"></param> 2466 /// <param name="RemoveItem"></param>
2467 /// <param name="fromTaskID"></param> 2467 /// <param name="fromTaskID"></param>
2468 public virtual void RezObject(IClientAPI remoteClient, UUID itemID, UUID groupID, 2468 public virtual void RezObject(IClientAPI remoteClient, UUID itemID, UUID rezGroupID,
2469 Vector3 RayEnd, Vector3 RayStart, 2469 Vector3 RayEnd, Vector3 RayStart,
2470 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 2470 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
2471 bool RezSelected, bool RemoveItem, UUID fromTaskID) 2471 bool RezSelected, bool RemoveItem, UUID fromTaskID)
@@ -2479,7 +2479,7 @@ namespace OpenSim.Region.Framework.Scenes
2479 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); 2479 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
2480 if (invAccess != null) 2480 if (invAccess != null)
2481 invAccess.RezObject( 2481 invAccess.RezObject(
2482 remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, 2482 remoteClient, itemID, rezGroupID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
2483 RezSelected, RemoveItem, fromTaskID, false); 2483 RezSelected, RemoveItem, fromTaskID, false);
2484 } 2484 }
2485 else 2485 else