diff options
author | Melanie Thielker | 2010-07-14 19:21:01 +0200 |
---|---|---|
committer | Melanie | 2010-07-14 19:49:54 +0100 |
commit | a7b5fe6a889a63acefbd91cd89e0a99c2a8d4162 (patch) | |
tree | 524ce35f95db7993260df1f64c3ce2c0acf97910 /OpenSim/Region/CoreModules | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-a7b5fe6a889a63acefbd91cd89e0a99c2a8d4162.zip opensim-SC_OLD-a7b5fe6a889a63acefbd91cd89e0a99c2a8d4162.tar.gz opensim-SC_OLD-a7b5fe6a889a63acefbd91cd89e0a99c2a8d4162.tar.bz2 opensim-SC_OLD-a7b5fe6a889a63acefbd91cd89e0a99c2a8d4162.tar.xz |
Remove useless quaternion parameter from AttachObject sig
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index a7b4c66..84c406a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
69 | get { return false; } | 69 | get { return false; } |
70 | } | 70 | } |
71 | 71 | ||
72 | public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent) | 72 | public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent) |
73 | { | 73 | { |
74 | m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject"); | 74 | m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject"); |
75 | 75 | ||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
84 | return; | 84 | return; |
85 | 85 | ||
86 | // Calls attach with a Zero position | 86 | // Calls attach with a Zero position |
87 | if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false)) | 87 | if (AttachObject(remoteClient, objectLocalID, AttachmentPt, Vector3.Zero, false)) |
88 | { | 88 | { |
89 | m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); | 89 | m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); |
90 | 90 | ||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
107 | } | 107 | } |
108 | 108 | ||
109 | public bool AttachObject( | 109 | public bool AttachObject( |
110 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) | 110 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Vector3 attachPos, bool silent) |
111 | { | 111 | { |
112 | SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID); | 112 | SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID); |
113 | if (group != null) | 113 | if (group != null) |
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
238 | tainted = true; | 238 | tainted = true; |
239 | 239 | ||
240 | AttachObject( | 240 | AttachObject( |
241 | remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false); | 241 | remoteClient, objatt.LocalId, AttachmentPt, objatt.AbsolutePosition, false); |
242 | //objatt.ScheduleGroupForFullUpdate(); | 242 | //objatt.ScheduleGroupForFullUpdate(); |
243 | 243 | ||
244 | if (tainted) | 244 | if (tainted) |