aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs1
-rw-r--r--OpenSim/Framework/IClientAPI.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs13
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs1
9 files changed, 33 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 722360b..0217476 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -54,6 +54,7 @@ Patches
54* devalnor-#708 54* devalnor-#708
55* dmiles (Daxtron Labs) 55* dmiles (Daxtron Labs)
56* dslake (Intel) 56* dslake (Intel)
57* FredoChaplin
57* Gerhard 58* Gerhard
58* Godfrey 59* Godfrey
59* Grumly57 60* Grumly57
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 2284ab8..c29e895 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -572,6 +572,7 @@ namespace OpenSim.Client.MXP.ClientStack
572 public event SetAppearance OnSetAppearance; 572 public event SetAppearance OnSetAppearance;
573 public event AvatarNowWearing OnAvatarNowWearing; 573 public event AvatarNowWearing OnAvatarNowWearing;
574 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 574 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
575 public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;
575 public event UUIDNameRequest OnDetachAttachmentIntoInv; 576 public event UUIDNameRequest OnDetachAttachmentIntoInv;
576 public event ObjectAttach OnObjectAttach; 577 public event ObjectAttach OnObjectAttach;
577 public event ObjectDeselect OnObjectDetach; 578 public event ObjectDeselect OnObjectDetach;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 2c153a9..1fa5ae2 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -53,6 +53,9 @@ namespace OpenSim.Framework
53 53
54 public delegate UUID RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); 54 public delegate UUID RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
55 55
56 public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
57 RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
58
56 public delegate void ObjectAttach( 59 public delegate void ObjectAttach(
57 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent); 60 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent);
58 61
@@ -566,6 +569,7 @@ namespace OpenSim.Framework
566 // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] 569 // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
567 event AvatarNowWearing OnAvatarNowWearing; 570 event AvatarNowWearing OnAvatarNowWearing;
568 event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 571 event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
572 event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;
569 event UUIDNameRequest OnDetachAttachmentIntoInv; 573 event UUIDNameRequest OnDetachAttachmentIntoInv;
570 event ObjectAttach OnObjectAttach; 574 event ObjectAttach OnObjectAttach;
571 event ObjectDeselect OnObjectDetach; 575 event ObjectDeselect OnObjectDetach;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9b2f0ef..47f8344 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -142,6 +142,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
142 private SetAppearance handlerSetAppearance; //OnSetAppearance; 142 private SetAppearance handlerSetAppearance; //OnSetAppearance;
143 private AvatarNowWearing handlerAvatarNowWearing; //OnAvatarNowWearing; 143 private AvatarNowWearing handlerAvatarNowWearing; //OnAvatarNowWearing;
144 private RezSingleAttachmentFromInv handlerRezSingleAttachment; //OnRezSingleAttachmentFromInv; 144 private RezSingleAttachmentFromInv handlerRezSingleAttachment; //OnRezSingleAttachmentFromInv;
145 private RezMultipleAttachmentsFromInv handlerRezMultipleAttachments; //OnRezMultipleAttachmentsFromInv;
145 private UUIDNameRequest handlerDetachAttachmentIntoInv; // Detach attachment! 146 private UUIDNameRequest handlerDetachAttachmentIntoInv; // Detach attachment!
146 private ObjectAttach handlerObjectAttach; //OnObjectAttach; 147 private ObjectAttach handlerObjectAttach; //OnObjectAttach;
147 private SetAlwaysRun handlerSetAlwaysRun; //OnSetAlwaysRun; 148 private SetAlwaysRun handlerSetAlwaysRun; //OnSetAlwaysRun;
@@ -916,6 +917,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
916 public event SetAppearance OnSetAppearance; 917 public event SetAppearance OnSetAppearance;
917 public event AvatarNowWearing OnAvatarNowWearing; 918 public event AvatarNowWearing OnAvatarNowWearing;
918 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 919 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
920 public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;
919 public event UUIDNameRequest OnDetachAttachmentIntoInv; 921 public event UUIDNameRequest OnDetachAttachmentIntoInv;
920 public event ObjectAttach OnObjectAttach; 922 public event ObjectAttach OnObjectAttach;
921 public event ObjectDeselect OnObjectDetach; 923 public event ObjectDeselect OnObjectDetach;
@@ -4717,6 +4719,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4717 4719
4718 break; 4720 break;
4719 4721
4722 case PacketType.RezMultipleAttachmentsFromInv:
4723 handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv;
4724 if (handlerRezMultipleAttachments != null)
4725 {
4726 RezMultipleAttachmentsFromInvPacket rez = (RezMultipleAttachmentsFromInvPacket)Pack;
4727 handlerRezMultipleAttachments(this, rez.HeaderData,
4728 rez.ObjectData);
4729 }
4730
4731 break;
4732
4720 case PacketType.DetachAttachmentIntoInv: 4733 case PacketType.DetachAttachmentIntoInv:
4721 handlerDetachAttachmentIntoInv = OnDetachAttachmentIntoInv; 4734 handlerDetachAttachmentIntoInv = OnDetachAttachmentIntoInv;
4722 if (handlerDetachAttachmentIntoInv != null) 4735 if (handlerDetachAttachmentIntoInv != null)
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index dc63b05..90ed9ae 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Region.Examples.SimpleModule
63 public event SetAppearance OnSetAppearance; 63 public event SetAppearance OnSetAppearance;
64 public event AvatarNowWearing OnAvatarNowWearing; 64 public event AvatarNowWearing OnAvatarNowWearing;
65 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 65 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
66 public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;
66 public event UUIDNameRequest OnDetachAttachmentIntoInv; 67 public event UUIDNameRequest OnDetachAttachmentIntoInv;
67 public event ObjectAttach OnObjectAttach; 68 public event ObjectAttach OnObjectAttach;
68 public event ObjectDeselect OnObjectDetach; 69 public event ObjectDeselect OnObjectDetach;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0be6b7f..11cee7c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -31,6 +31,7 @@ using System.Reflection;
31using System.Text; 31using System.Text;
32using System.Timers; 32using System.Timers;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.Packets;
34using log4net; 35using log4net;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
@@ -2563,6 +2564,15 @@ namespace OpenSim.Region.Framework.Scenes
2563 return att.UUID; 2564 return att.UUID;
2564 } 2565 }
2565 2566
2567 public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
2568 RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects)
2569 {
2570 foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects)
2571 {
2572 RezSingleAttachment(remoteClient, obj.ItemID, obj.AttachmentPt);
2573 }
2574 }
2575
2566 public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent) 2576 public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent)
2567 { 2577 {
2568 m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent); 2578 m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0da819d..0991171 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1935,6 +1935,7 @@ namespace OpenSim.Region.Framework.Scenes
1935 client.OnDeRezObject += DeRezObject; 1935 client.OnDeRezObject += DeRezObject;
1936 client.OnRezObject += RezObject; 1936 client.OnRezObject += RezObject;
1937 client.OnRezSingleAttachmentFromInv += RezSingleAttachment; 1937 client.OnRezSingleAttachmentFromInv += RezSingleAttachment;
1938 client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;
1938 client.OnDetachAttachmentIntoInv += DetachSingleAttachmentToInv; 1939 client.OnDetachAttachmentIntoInv += DetachSingleAttachmentToInv;
1939 client.OnObjectAttach += m_sceneGraph.AttachObject; 1940 client.OnObjectAttach += m_sceneGraph.AttachObject;
1940 client.OnObjectDetach += m_sceneGraph.DetachObject; 1941 client.OnObjectDetach += m_sceneGraph.DetachObject;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 4de6793..644f429 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -169,6 +169,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
169 public event SetAppearance OnSetAppearance; 169 public event SetAppearance OnSetAppearance;
170 public event AvatarNowWearing OnAvatarNowWearing; 170 public event AvatarNowWearing OnAvatarNowWearing;
171 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 171 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
172 public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;
172 public event UUIDNameRequest OnDetachAttachmentIntoInv; 173 public event UUIDNameRequest OnDetachAttachmentIntoInv;
173 public event ObjectAttach OnObjectAttach; 174 public event ObjectAttach OnObjectAttach;
174 public event ObjectDeselect OnObjectDetach; 175 public event ObjectDeselect OnObjectDetach;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 33f080f..e82c26d 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Tests.Common.Mock
74 public event SetAppearance OnSetAppearance; 74 public event SetAppearance OnSetAppearance;
75 public event AvatarNowWearing OnAvatarNowWearing; 75 public event AvatarNowWearing OnAvatarNowWearing;
76 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 76 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
77 public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;
77 public event UUIDNameRequest OnDetachAttachmentIntoInv; 78 public event UUIDNameRequest OnDetachAttachmentIntoInv;
78 public event ObjectAttach OnObjectAttach; 79 public event ObjectAttach OnObjectAttach;
79 public event ObjectDeselect OnObjectDetach; 80 public event ObjectDeselect OnObjectDetach;