diff options
| author | Melanie | 2012-01-29 22:50:59 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-29 22:50:59 +0000 |
| commit | 9a86a713d3fa71d00328ee6d005bb0c37a76f214 (patch) | |
| tree | 0aa5d98a226548d45bd7fed54bc80a104ca6bc2e /OpenSim/Region/ScriptEngine/Shared | |
| parent | Make all NPCs owned by default (diff) | |
| parent | Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/... (diff) | |
| download | opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.zip opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.gz opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.bz2 opensim-SC_OLD-9a86a713d3fa71d00328ee6d005bb0c37a76f214.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 9c4bfb6..01e5dbe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -5882,7 +5882,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 5882 | 5882 | ||
| 5883 | foreach (GridRegion sri in neighbors) | 5883 | foreach (GridRegion sri in neighbors) |
| 5884 | { | 5884 | { |
| 5885 | if (sri.RegionLocX == neighborX && sri.RegionLocY == neighborY) | 5885 | if (sri.RegionCoordX == neighborX && sri.RegionCoordY == neighborY) |
| 5886 | return 0; | 5886 | return 0; |
| 5887 | } | 5887 | } |
| 5888 | 5888 | ||