From c6ec573d105b52f65e02077e8603a9b586884ecd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Sep 2011 00:36:38 +0100
Subject: Get rid of the confusing version of
IAttachmentsModule.RezSingleAttachmentFromInventory() with the
updateInventoryStatus switch, since this is never called with false
---
.../CoreModules/Avatar/Attachments/AttachmentsModule.cs | 13 ++-----------
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 14 --------------
2 files changed, 2 insertions(+), 25 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index dde6ca6..67969b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -326,12 +326,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
public ISceneEntity RezSingleAttachmentFromInventory(
IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
{
- return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true);
- }
-
- public ISceneEntity RezSingleAttachmentFromInventory(
- IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
- {
// m_log.DebugFormat(
// "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}",
// (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name);
@@ -352,11 +346,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt);
- if (updateInventoryStatus)
- {
- if (att == null)
- DetachSingleAttachmentToInv(itemID, sp.ControllingClient);
- }
+ if (att == null)
+ DetachSingleAttachmentToInv(itemID, sp.ControllingClient);
return att;
}
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index dd11ded..73d15a5 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -88,20 +88,6 @@ namespace OpenSim.Region.Framework.Interfaces
ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
///
- /// Rez an attachment from user inventory
- ///
- ///
- ///
- ///
- ///
- /// If true, we also update the user's inventory to show that the attachment is set. If false, we do not.
- /// False is required so that we don't attempt to update information when a user enters a scene with the
- /// attachment already correctly set up in inventory.
- /// The uuid of the scene object that was attached. Null if the scene object could not be found
- ISceneEntity RezSingleAttachmentFromInventory(
- IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
-
- ///
/// Rez multiple attachments from a user's inventory
///
///
--
cgit v1.1