diff options
author | Justin Clark-Casey (justincc) | 2011-09-13 22:33:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-13 22:33:15 +0100 |
commit | 61affee814b6c2a09cb33b1823f009d386f54818 (patch) | |
tree | ae5c02b76af6eb7c8b7e889964c2bb72389db904 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | Remove UpdateKnownItem() from IAttachmentsModule. (diff) | |
download | opensim-SC_OLD-61affee814b6c2a09cb33b1823f009d386f54818.zip opensim-SC_OLD-61affee814b6c2a09cb33b1823f009d386f54818.tar.gz opensim-SC_OLD-61affee814b6c2a09cb33b1823f009d386f54818.tar.bz2 opensim-SC_OLD-61affee814b6c2a09cb33b1823f009d386f54818.tar.xz |
remove redunant itemID and agentID arguments from UpdateKnownItem().
itemID is always taken taken from the group's stored item id, and agentID is never used.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 03837b5..b9cd880 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
151 | // { | 151 | // { |
152 | grp.IsAttachment = false; | 152 | grp.IsAttachment = false; |
153 | grp.AbsolutePosition = grp.RootPart.AttachedPos; | 153 | grp.AbsolutePosition = grp.RootPart.AttachedPos; |
154 | UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID); | 154 | UpdateKnownItem(sp.ControllingClient, grp); |
155 | grp.IsAttachment = true; | 155 | grp.IsAttachment = true; |
156 | // } | 156 | // } |
157 | } | 157 | } |
@@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
668 | group.IsAttachment = false; | 668 | group.IsAttachment = false; |
669 | group.AbsolutePosition = group.RootPart.AttachedPos; | 669 | group.AbsolutePosition = group.RootPart.AttachedPos; |
670 | 670 | ||
671 | UpdateKnownItem(sp.ControllingClient, group, group.GetFromItemID(), group.OwnerID); | 671 | UpdateKnownItem(sp.ControllingClient, group); |
672 | m_scene.DeleteSceneObject(group, false); | 672 | m_scene.DeleteSceneObject(group, false); |
673 | 673 | ||
674 | return; | 674 | return; |
@@ -703,9 +703,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
703 | /// </remarks> | 703 | /// </remarks> |
704 | /// <param name="remoteClient"></param> | 704 | /// <param name="remoteClient"></param> |
705 | /// <param name="grp"></param> | 705 | /// <param name="grp"></param> |
706 | /// <param name="itemID"></param> | 706 | private void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp) |
707 | /// <param name="agentID"></param> | ||
708 | private void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID) | ||
709 | { | 707 | { |
710 | if (grp.HasGroupChanged || grp.ContainsScripts()) | 708 | if (grp.HasGroupChanged || grp.ContainsScripts()) |
711 | { | 709 | { |
@@ -715,7 +713,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
715 | 713 | ||
716 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); | 714 | string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); |
717 | 715 | ||
718 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 716 | InventoryItemBase item = new InventoryItemBase(grp.GetFromItemID(), remoteClient.AgentId); |
719 | item = m_scene.InventoryService.GetItem(item); | 717 | item = m_scene.InventoryService.GetItem(item); |
720 | 718 | ||
721 | if (item != null) | 719 | if (item != null) |