diff options
author | Melanie Thielker | 2010-07-14 19:58:23 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-07-14 19:58:23 +0200 |
commit | bebbe407ee166a0aa22f0ec8d14ada780924f9af (patch) | |
tree | 79e38927939a6e95ff4ff105b357a8d3888a67b8 /OpenSim/Region/Framework | |
parent | Remove useless quaternion parameter from AttachObject sig (diff) | |
download | opensim-SC_OLD-bebbe407ee166a0aa22f0ec8d14ada780924f9af.zip opensim-SC_OLD-bebbe407ee166a0aa22f0ec8d14ada780924f9af.tar.gz opensim-SC_OLD-bebbe407ee166a0aa22f0ec8d14ada780924f9af.tar.bz2 opensim-SC_OLD-bebbe407ee166a0aa22f0ec8d14ada780924f9af.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 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 11887e6..9fe6d96 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
58 | /// <param name="silent"></param> | 58 | /// <param name="silent"></param> |
59 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 59 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
60 | bool AttachObject( | 60 | bool AttachObject( |
61 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Vector3 attachPos, bool silent); | 61 | IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent); |
62 | 62 | ||
63 | /// <summary> | 63 | /// <summary> |
64 | /// Rez an attachment from user inventory and change inventory status to match. | 64 | /// 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 873a11d..daad3d2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2632,8 +2632,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2632 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2632 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2633 | 2633 | ||
2634 | if (AttachmentsModule != null) | 2634 | if (AttachmentsModule != null) |
2635 | AttachmentsModule.AttachObject( | 2635 | AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false); |
2636 | sp.ControllingClient, grp.LocalId, (uint)0, grp.AbsolutePosition, false); | ||
2637 | 2636 | ||
2638 | } | 2637 | } |
2639 | else | 2638 | else |