aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-21 04:41:39 +0000
committerMelanie Thielker2008-11-21 04:41:39 +0000
commite9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b (patch)
treef8fe1f5f59fbb8c5744bb04af401916cc573ac15 /OpenSim/Region/ClientStack
parentPrevent a null reference when giving items. (diff)
downloadopensim-SC-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.zip
opensim-SC-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.tar.gz
opensim-SC-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.tar.bz2
opensim-SC-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.tar.xz
Plumb in the list if user IDs to the land module to allow selection
of objects by owner name
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 25927b6..b11a5e8 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5713,12 +5713,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5713 case PacketType.ParcelSelectObjects: 5713 case PacketType.ParcelSelectObjects:
5714 ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack; 5714 ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack;
5715 5715
5716 List<UUID> returnIDs = new List<UUID>();
5717
5718 foreach(ParcelSelectObjectsPacket.ReturnIDsBlock rb in
5719 selectPacket.ReturnIDs)
5720 {
5721 returnIDs.Add(rb.ReturnID);
5722 }
5723
5716 handlerParcelSelectObjects = OnParcelSelectObjects; 5724 handlerParcelSelectObjects = OnParcelSelectObjects;
5717 5725
5718 if (handlerParcelSelectObjects != null) 5726 if (handlerParcelSelectObjects != null)
5719 { 5727 {
5720 handlerParcelSelectObjects(selectPacket.ParcelData.LocalID, 5728 handlerParcelSelectObjects(selectPacket.ParcelData.LocalID,
5721 Convert.ToInt32(selectPacket.ParcelData.ReturnType), this); 5729 Convert.ToInt32(selectPacket.ParcelData.ReturnType), returnIDs, this);
5722 } 5730 }
5723 break; 5731 break;
5724 case PacketType.ParcelObjectOwnersRequest: 5732 case PacketType.ParcelObjectOwnersRequest: