diff options
author | Melanie Thielker | 2008-11-21 05:35:35 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-21 05:35:35 +0000 |
commit | 46278b34b17509374bff8d96e1bf36101b98086d (patch) | |
tree | 3a37310d124847a4d9dc2c63d6bbc3d3769af177 /OpenSim/Region | |
parent | Plumb in the list if user IDs to the land module to allow selection (diff) | |
download | opensim-SC_OLD-46278b34b17509374bff8d96e1bf36101b98086d.zip opensim-SC_OLD-46278b34b17509374bff8d96e1bf36101b98086d.tar.gz opensim-SC_OLD-46278b34b17509374bff8d96e1bf36101b98086d.tar.bz2 opensim-SC_OLD-46278b34b17509374bff8d96e1bf36101b98086d.tar.xz |
Allow selecting group objects and selecting objects by owner from the
parcel dialog.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index be806c2..208338f 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -664,12 +664,17 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
664 | } | 664 | } |
665 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_GROUP && obj.GroupID == landData.GroupID && landData.GroupID != UUID.Zero) | 665 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_GROUP && obj.GroupID == landData.GroupID && landData.GroupID != UUID.Zero) |
666 | { | 666 | { |
667 | resultLocalIDs.Add(obj.LocalId); | ||
667 | } | 668 | } |
668 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER && | 669 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER && |
669 | obj.OwnerID != remote_client.AgentId) | 670 | obj.OwnerID != remote_client.AgentId) |
670 | { | 671 | { |
671 | resultLocalIDs.Add(obj.LocalId); | 672 | resultLocalIDs.Add(obj.LocalId); |
672 | } | 673 | } |
674 | else if (request_type == (int)ObjectReturnType.List && returnIDs.Contains(obj.OwnerID)) | ||
675 | { | ||
676 | resultLocalIDs.Add(obj.LocalId); | ||
677 | } | ||
673 | } | 678 | } |
674 | } | 679 | } |
675 | } | 680 | } |