diff options
author | Melanie Thielker | 2008-11-21 04:41:39 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-21 04:41:39 +0000 |
commit | e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b (patch) | |
tree | f8fe1f5f59fbb8c5744bb04af401916cc573ac15 /OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |
parent | Prevent a null reference when giving items. (diff) | |
download | opensim-SC_OLD-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.zip opensim-SC_OLD-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.tar.gz opensim-SC_OLD-e9ad6f7913ed1e6fe1023cda3f9c04c0c6b4de2b.tar.bz2 opensim-SC_OLD-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/Environment/Modules/World/Land/LandObject.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 197d5c2..be806c2 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
645 | 645 | ||
646 | #region Object Select and Object Owner Listing | 646 | #region Object Select and Object Owner Listing |
647 | 647 | ||
648 | public void sendForceObjectSelect(int local_id, int request_type, IClientAPI remote_client) | 648 | public void sendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client) |
649 | { | 649 | { |
650 | if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId, this)) | 650 | if (m_scene.ExternalChecks.ExternalChecksCanEditParcel(remote_client.AgentId, this)) |
651 | { | 651 | { |
@@ -662,9 +662,9 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
662 | { | 662 | { |
663 | resultLocalIDs.Add(obj.LocalId); | 663 | resultLocalIDs.Add(obj.LocalId); |
664 | } | 664 | } |
665 | // else if (request_type == LandManager.LAND_SELECT_OBJECTS_GROUP && ...) // TODO: group support | 665 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_GROUP && obj.GroupID == landData.GroupID && landData.GroupID != UUID.Zero) |
666 | // { | 666 | { |
667 | // } | 667 | } |
668 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER && | 668 | else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER && |
669 | obj.OwnerID != remote_client.AgentId) | 669 | obj.OwnerID != remote_client.AgentId) |
670 | { | 670 | { |