aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-14 19:21:01 +0200
committerMelanie Thielker2010-07-14 19:21:01 +0200
commit0c445239a68688311d6fa7405ef13ceb3e773930 (patch)
tree77bda9a0ddc1bad20998161198a7190166382432 /OpenSim/Region/CoreModules
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-0c445239a68688311d6fa7405ef13ceb3e773930.zip
opensim-SC_OLD-0c445239a68688311d6fa7405ef13ceb3e773930.tar.gz
opensim-SC_OLD-0c445239a68688311d6fa7405ef13ceb3e773930.tar.bz2
opensim-SC_OLD-0c445239a68688311d6fa7405ef13ceb3e773930.tar.xz
Remove useless quaternion parameter from AttachObject sig
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs8
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 d3d6f25..08b2315 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
71 get { return false; } 71 get { return false; }
72 } 72 }
73 73
74 public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent) 74 public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
75 { 75 {
76 m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject"); 76 m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
77 77
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
86 return; 86 return;
87 87
88 // Calls attach with a Zero position 88 // Calls attach with a Zero position
89 if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false)) 89 if (AttachObject(remoteClient, objectLocalID, AttachmentPt, Vector3.Zero, false))
90 { 90 {
91 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); 91 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
92 92
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
109 } 109 }
110 110
111 public bool AttachObject( 111 public bool AttachObject(
112 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) 112 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Vector3 attachPos, bool silent)
113 { 113 {
114 SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID); 114 SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
115 if (group != null) 115 if (group != null)
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
246 tainted = true; 246 tainted = true;
247 247
248 AttachObject( 248 AttachObject(
249 remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false); 249 remoteClient, objatt.LocalId, AttachmentPt, objatt.AbsolutePosition, false);
250 //objatt.ScheduleGroupForFullUpdate(); 250 //objatt.ScheduleGroupForFullUpdate();
251 251
252 if (tainted) 252 if (tainted)