diff options
author | Justin Clark-Casey (justincc) | 2013-04-06 02:34:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-04-06 02:34:51 +0100 |
commit | 7f070236f72058ba22d017048b978adea380f0a1 (patch) | |
tree | 946880909bc158d7aaf1e2170da2db32cf3a0278 /OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |
parent | When rezzing a coalesced object, check adjust position of all components. (diff) | |
download | opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.zip opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.tar.gz opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.tar.bz2 opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.tar.xz |
Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 79dd4a0..77299be 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -1453,6 +1453,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
1453 | 1453 | ||
1454 | bool permission = false; | 1454 | bool permission = false; |
1455 | 1455 | ||
1456 | m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name); | ||
1457 | |||
1456 | ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); | 1458 | ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); |
1457 | if (land == null) return false; | 1459 | if (land == null) return false; |
1458 | 1460 | ||