aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2010-07-14 19:51:12 +0100
committerMelanie2010-07-14 19:51:12 +0100
commite1ea82b329b9346ccacb1edd25a0e2b44f07e8c8 (patch)
tree6bff7c77be5ebee69eb1fecbdc1dce5633bc42e5 /OpenSim/Region/Framework
parentRemove useless quaternion parameter from AttachObject sig (diff)
downloadopensim-SC_OLD-e1ea82b329b9346ccacb1edd25a0e2b44f07e8c8.zip
opensim-SC_OLD-e1ea82b329b9346ccacb1edd25a0e2b44f07e8c8.tar.gz
opensim-SC_OLD-e1ea82b329b9346ccacb1edd25a0e2b44f07e8c8.tar.bz2
opensim-SC_OLD-e1ea82b329b9346ccacb1edd25a0e2b44f07e8c8.tar.xz
Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index b1bc3bc..2af2548 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Interfaces
57 /// <param name="silent"></param> 57 /// <param name="silent"></param>
58 /// <returns>true if the object was successfully attached, false otherwise</returns> 58 /// <returns>true if the object was successfully attached, false otherwise</returns>
59 bool AttachObject( 59 bool AttachObject(
60 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Vector3 attachPos, bool silent); 60 IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent);
61 61
62 /// <summary> 62 /// <summary>
63 /// Rez an attachment from user inventory and change inventory status to match. 63 /// Rez an attachment from user inventory and change inventory status to match.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c47369b..b0f4ac0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2571,8 +2571,7 @@ namespace OpenSim.Region.Framework.Scenes
2571 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2571 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2572 2572
2573 if (AttachmentsModule != null) 2573 if (AttachmentsModule != null)
2574 AttachmentsModule.AttachObject( 2574 AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false);
2575 sp.ControllingClient, grp.LocalId, (uint)0, grp.AbsolutePosition, false);
2576 2575
2577 } 2576 }
2578 else 2577 else