OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-13 22:33:15 +01:00
parent 2d62484f11
commit 61affee814
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// { // {
grp.IsAttachment = false; grp.IsAttachment = false;
grp.AbsolutePosition = grp.RootPart.AttachedPos; grp.AbsolutePosition = grp.RootPart.AttachedPos;
UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID); UpdateKnownItem(sp.ControllingClient, grp);
grp.IsAttachment = true; grp.IsAttachment = true;
// } // }
} }
@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
group.IsAttachment = false; group.IsAttachment = false;
group.AbsolutePosition = group.RootPart.AttachedPos; group.AbsolutePosition = group.RootPart.AttachedPos;
UpdateKnownItem(sp.ControllingClient, group, group.GetFromItemID(), group.OwnerID); UpdateKnownItem(sp.ControllingClient, group);
m_scene.DeleteSceneObject(group, false); m_scene.DeleteSceneObject(group, false);
return; return;
@ -703,9 +703,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
/// </remarks> /// </remarks>
/// <param name="remoteClient"></param> /// <param name="remoteClient"></param>
/// <param name="grp"></param> /// <param name="grp"></param>
/// <param name="itemID"></param> private void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp)
/// <param name="agentID"></param>
private void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID)
{ {
if (grp.HasGroupChanged || grp.ContainsScripts()) if (grp.HasGroupChanged || grp.ContainsScripts())
{ {
@ -715,7 +713,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); InventoryItemBase item = new InventoryItemBase(grp.GetFromItemID(), remoteClient.AgentId);
item = m_scene.InventoryService.GetItem(item); item = m_scene.InventoryService.GetItem(item);
if (item != null) if (item != null)