aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Land/LandObject.cs
diff options
context:
space:
mode:
authorMelanie2010-03-18 18:57:29 +0000
committerMelanie2010-03-18 18:57:29 +0000
commit734b0416deac953937df9cd6dd1d0bbfbdc03a58 (patch)
treea2fec4f069a72c70ee790ea28e2762471c01ee41 /OpenSim/Region/CoreModules/World/Land/LandObject.cs
parentInconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminati... (diff)
downloadopensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.zip
opensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.tar.gz
opensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.tar.bz2
opensim-SC_OLD-734b0416deac953937df9cd6dd1d0bbfbdc03a58.tar.xz
Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index e85136a..331f183 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -892,7 +892,7 @@ namespace OpenSim.Region.CoreModules.World.Land
892 892
893 foreach (List<SceneObjectGroup> ol in returns.Values) 893 foreach (List<SceneObjectGroup> ol in returns.Values)
894 { 894 {
895 if (m_scene.Permissions.CanUseObjectReturn(this, type, remote_client, ol)) 895 if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol))
896 m_scene.returnObjects(ol.ToArray(), remote_client.AgentId); 896 m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);
897 } 897 }
898 } 898 }