aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-12 18:31:41 +0100
committerJustin Clark-Casey (justincc)2011-04-12 18:31:41 +0100
commit98d7de22dc44ca1e5971301c02a6a1fe49620889 (patch)
treec9c7eb66ec3d1bb81d0005508e3ec3e87d628a3b /OpenSim/Region/CoreModules
parentminor: add a bit more method doc to IInventoryService.GetItem() (diff)
downloadopensim-SC_OLD-98d7de22dc44ca1e5971301c02a6a1fe49620889.zip
opensim-SC_OLD-98d7de22dc44ca1e5971301c02a6a1fe49620889.tar.gz
opensim-SC_OLD-98d7de22dc44ca1e5971301c02a6a1fe49620889.tar.bz2
opensim-SC_OLD-98d7de22dc44ca1e5971301c02a6a1fe49620889.tar.xz
Fix (add) ability to rez objects by dragging them out of another prim's inventory.
This should happen if the client supplies a task ID with the RezObject call. The rez goes through the same code as llRezObject(), so the same perms are applied. Rotation isn't yet preserved, this should be fixed shortly.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 9fbfc34..cdee53c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -552,8 +552,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
552 /// <summary> 552 /// <summary>
553 /// Rez an object into the scene from the user's inventory 553 /// Rez an object into the scene from the user's inventory
554 /// </summary> 554 /// </summary>
555 /// <remarks>
555 /// FIXME: It would be really nice if inventory access modules didn't also actually do the work of rezzing 556 /// FIXME: It would be really nice if inventory access modules didn't also actually do the work of rezzing
556 /// things to the scene. The caller should be doing that, I think. 557 /// things to the scene. The caller should be doing that, I think.
558 /// </remarks>
557 /// <param name="remoteClient"></param> 559 /// <param name="remoteClient"></param>
558 /// <param name="itemID"></param> 560 /// <param name="itemID"></param>
559 /// <param name="RayEnd"></param> 561 /// <param name="RayEnd"></param>
@@ -570,6 +572,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
570 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 572 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
571 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) 573 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
572 { 574 {
575// m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
576
573 // Work out position details 577 // Work out position details
574 byte bRayEndIsIntersection = (byte)0; 578 byte bRayEndIsIntersection = (byte)0;
575 579