diff options
| author | John Hurliman | 2010-03-19 15:17:15 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-03-19 15:17:15 -0700 |
| commit | 5e65bef80565e754e3f6c6d20e7d57d702174034 (patch) | |
| tree | 7ee0765c8e2dcc3f7f2bbdf5a7f43550c289950c /OpenSim/Region/CoreModules/World/Land/LandObject.cs | |
| parent | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene... (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC_OLD-5e65bef80565e754e3f6c6d20e7d57d702174034.zip opensim-SC_OLD-5e65bef80565e754e3f6c6d20e7d57d702174034.tar.gz opensim-SC_OLD-5e65bef80565e754e3f6c6d20e7d57d702174034.tar.bz2 opensim-SC_OLD-5e65bef80565e754e3f6c6d20e7d57d702174034.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandObject.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
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 b2d9b66..aca5514 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -894,7 +894,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 894 | 894 | ||
| 895 | foreach (List<SceneObjectGroup> ol in returns.Values) | 895 | foreach (List<SceneObjectGroup> ol in returns.Values) |
| 896 | { | 896 | { |
| 897 | if (m_scene.Permissions.CanUseObjectReturn(this, type, remote_client, ol)) | 897 | if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol)) |
| 898 | m_scene.returnObjects(ol.ToArray(), remote_client.AgentId); | 898 | m_scene.returnObjects(ol.ToArray(), remote_client.AgentId); |
| 899 | } | 899 | } |
| 900 | } | 900 | } |