diff options
| author | Justin Clark-Casey (justincc) | 2012-07-06 23:22:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-07-06 23:22:40 +0100 |
| commit | f1f390cfdfa7485d771e65449889b12b64ad7f56 (patch) | |
| tree | 3e7204b3062a0b6d3800f4dcd6ef311e6f1d2a70 /OpenSim/Region | |
| parent | minor: Remove some wrong comments in attachments regression tests (diff) | |
| download | opensim-SC-f1f390cfdfa7485d771e65449889b12b64ad7f56.zip opensim-SC-f1f390cfdfa7485d771e65449889b12b64ad7f56.tar.gz opensim-SC-f1f390cfdfa7485d771e65449889b12b64ad7f56.tar.bz2 opensim-SC-f1f390cfdfa7485d771e65449889b12b64ad7f56.tar.xz | |
Remove now duplicate interregion object check that should have been removed a few commits ago in 43a2da9
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d98c01d..5c7bca0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2600,18 +2600,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2600 | else | 2600 | else |
| 2601 | { | 2601 | { |
| 2602 | AddRestoredSceneObject(sceneObject, true, false); | 2602 | AddRestoredSceneObject(sceneObject, true, false); |
| 2603 | |||
| 2604 | if (!Permissions.CanObjectEntry(sceneObject.UUID, | ||
| 2605 | true, sceneObject.AbsolutePosition)) | ||
| 2606 | { | ||
| 2607 | // Deny non attachments based on parcel settings | ||
| 2608 | // | ||
| 2609 | m_log.Info("[INTERREGION]: Denied prim crossing because of parcel settings"); | ||
| 2610 | |||
| 2611 | DeleteSceneObject(sceneObject, false); | ||
| 2612 | |||
| 2613 | return false; | ||
| 2614 | } | ||
| 2615 | } | 2603 | } |
| 2616 | 2604 | ||
| 2617 | return true; | 2605 | return true; |