aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-14 19:21:01 +0200
committerMelanie Thielker2010-07-14 19:21:01 +0200
commit0c445239a68688311d6fa7405ef13ceb3e773930 (patch)
tree77bda9a0ddc1bad20998161198a7190166382432
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-0c445239a68688311d6fa7405ef13ceb3e773930.zip
opensim-SC-0c445239a68688311d6fa7405ef13ceb3e773930.tar.gz
opensim-SC-0c445239a68688311d6fa7405ef13ceb3e773930.tar.bz2
opensim-SC-0c445239a68688311d6fa7405ef13ceb3e773930.tar.xz
Remove useless quaternion parameter from AttachObject sig
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs8
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
6 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d85b101..100c861 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework
57 RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); 57 RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
58 58
59 public delegate void ObjectAttach( 59 public delegate void ObjectAttach(
60 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent); 60 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
61 61
62 public delegate void ModifyTerrain(UUID user, 62 public delegate void ModifyTerrain(UUID user,
63 float height, float seconds, byte size, byte action, float north, float west, float south, float east, 63 float height, float seconds, byte size, byte action, float north, float west, float south, float east,
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ecfc68f..82b9958 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5744,7 +5744,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5744 { 5744 {
5745 if (att.ObjectData.Length > 0) 5745 if (att.ObjectData.Length > 0)
5746 { 5746 {
5747 handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation, false); 5747 handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, false);
5748 } 5748 }
5749 } 5749 }
5750 } 5750 }
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)
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 6e69902..00f6918 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
73 client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos, 73 client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos,
74 IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; }; 74 IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; };
75 client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, 75 client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt,
76 Quaternion rot, bool silent) { this.Stale = true; }; 76 bool silent) { this.Stale = true; };
77 client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID, 77 client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID,
78 UUID GroupID) { this.Stale = true; }; 78 UUID GroupID) { this.Stale = true; };
79 client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID, 79 client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID,
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 958847b..11887e6 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces
45 /// <param name="rot"></param> 45 /// <param name="rot"></param>
46 /// <param name="silent"></param> 46 /// <param name="silent"></param>
47 void AttachObject( 47 void AttachObject(
48 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent); 48 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
49 49
50 /// <summary> 50 /// <summary>
51 /// Attach an object to an avatar. 51 /// Attach an object to an avatar.
@@ -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, Quaternion rot, Vector3 attachPos, bool silent); 61 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Vector3 attachPos, 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 7c25e87..873a11d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2633,7 +2633,7 @@ namespace OpenSim.Region.Framework.Scenes
2633 2633
2634 if (AttachmentsModule != null) 2634 if (AttachmentsModule != null)
2635 AttachmentsModule.AttachObject( 2635 AttachmentsModule.AttachObject(
2636 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); 2636 sp.ControllingClient, grp.LocalId, (uint)0, grp.AbsolutePosition, false);
2637 2637
2638 } 2638 }
2639 else 2639 else