aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-03 23:26:52 +0100
committerJustin Clark-Casey (justincc)2011-10-03 23:26:52 +0100
commit34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c (patch)
tree6e67c262564a16a79e7821cc5d1c5a70090f5677 /OpenSim/Region/ClientStack
parentRemove vestigal RegionStatus.SlaveScene. (diff)
parentRemove usage of Linden packet types from inside Attachments Module and interface (diff)
downloadopensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.zip
opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.gz
opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.bz2
opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ce2ff86..29dce17 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6079,9 +6079,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6079 RezMultipleAttachmentsFromInv handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv; 6079 RezMultipleAttachmentsFromInv handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv;
6080 if (handlerRezMultipleAttachments != null) 6080 if (handlerRezMultipleAttachments != null)
6081 { 6081 {
6082 RezMultipleAttachmentsFromInvPacket rez = (RezMultipleAttachmentsFromInvPacket)Pack; 6082 List<KeyValuePair<UUID, uint>> rezlist = new List<KeyValuePair<UUID, uint>>();
6083 handlerRezMultipleAttachments(this, rez.HeaderData, 6083 foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in ((RezMultipleAttachmentsFromInvPacket)Pack).ObjectData)
6084 rez.ObjectData); 6084 rezlist.Add(new KeyValuePair<UUID, uint>(obj.ItemID, obj.AttachmentPt));
6085 handlerRezMultipleAttachments(this, rezlist);
6085 } 6086 }
6086 6087
6087 return true; 6088 return true;