aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-27 22:15:38 +0000
committerTeravus Ovares2008-04-27 22:15:38 +0000
commit54563d8dea86ca1e022f3aafa791908e8bcc4912 (patch)
tree2eab339160a5f89cb637c6554e6d56be594d2180 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parent* Single Attachments now work from inventory. You can attach from inventory ... (diff)
downloadopensim-SC-54563d8dea86ca1e022f3aafa791908e8bcc4912.zip
opensim-SC-54563d8dea86ca1e022f3aafa791908e8bcc4912.tar.gz
opensim-SC-54563d8dea86ca1e022f3aafa791908e8bcc4912.tar.bz2
opensim-SC-54563d8dea86ca1e022f3aafa791908e8bcc4912.tar.xz
* Patch from XenReborn to make remove-region work properly without needing to do a change-region first. Careful though. I still suggest you do a change-region first.
* Patch from Melanie to implement touch_end. * Thanks XenReborn!. Thanks Melanie!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 104ae48..d00f601 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -324,8 +324,7 @@ namespace OpenSim.Region.Environment.Scenes
324 // Calls attach with a Zero position 324 // Calls attach with a Zero position
325 AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero); 325 AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero);
326 } 326 }
327 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt, 327 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask)
328 uint ItemFlags, uint NextOwnerMask)
329 { 328 {
330 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, LLVector3.Zero, LLVector3.Zero, LLUUID.Zero, (byte)1, true, 329 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, LLVector3.Zero, LLVector3.Zero, LLUUID.Zero, (byte)1, true,
331 (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer), 330 (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer),