diff options
| author | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-07-04 03:37:45 +0100 |
| commit | 4468aa0dcfebb045bc54df1f67f021f85f9bc4b6 (patch) | |
| tree | f52b7cf28acfe4bdbdff7ed7dfd112c6dd6b16fb /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Finally remove the requirement for an InventoryItem/FolderBase object to (diff) | |
| parent | New config var: DisableObjectTransfer. If set to True, objects never cross; i... (diff) | |
| download | opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.zip opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.gz opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.bz2 opensim-SC_OLD-4468aa0dcfebb045bc54df1f67f021f85f9bc4b6.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 8c1a628..06900f0 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1302,7 +1302,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1302 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1302 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
| 1303 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1303 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
| 1304 | 1304 | ||
| 1305 | if ((newPoint.X > 257f || newPoint.X < -1f || newPoint.Y > 257f || newPoint.Y < -1f)) | 1305 | |
| 1306 | // allow outide region?? | ||
| 1307 | if (newPoint.X < -1f || newPoint.Y < -1f) | ||
| 1308 | return true; | ||
| 1309 | if (newPoint.X > scene.RegionInfo.RegionSizeX + 1.0f || newPoint.Y > scene.RegionInfo.RegionSizeY + 1.0f) | ||
| 1306 | { | 1310 | { |
| 1307 | return true; | 1311 | return true; |
| 1308 | } | 1312 | } |