aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs17
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 4c6e1c8..35112e7 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -699,8 +699,23 @@ namespace OpenSim.Region.Environment.Scenes
699 group.DeleteParts(); 699 group.DeleteParts();
700 } 700 }
701 701
702 public virtual void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos) 702 public virtual void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart,
703 LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
704 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
705 bool RezSelected, bool RemoveItem, LLUUID fromTaskID)
703 { 706 {
707 byte bRayEndIsIntersection = (byte)0;
708
709 if (RayEndIsIntersection)
710 {
711 bRayEndIsIntersection = (byte)1;
712 }
713 else
714 {
715 bRayEndIsIntersection = (byte)0;
716 }
717
718 LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, new LLQuaternion(0, 0, 0, 1), BypassRayCast, bRayEndIsIntersection);
704 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); 719 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
705 if (userInfo != null) 720 if (userInfo != null)
706 { 721 {