diff options
| author | Melanie | 2013-03-15 23:45:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-15 23:45:32 +0000 |
| commit | b9146a79220c7e15ff0241fb6216028ddf15bee8 (patch) | |
| tree | 18e3342a99e448b19a1a5bb29d9579ef9d9bb817 /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the table and field names of XAssetService mysql db tables to be capit... (diff) | |
| download | opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.zip opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.gz opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.bz2 opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandChannel.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs index 7fc358d..73c592d 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs | |||
| @@ -95,6 +95,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 95 | return null; | 95 | return null; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | public ILandObject GetLandObject(Vector3 position) | ||
| 99 | { | ||
| 100 | return GetLandObject(position.X, position.Y); | ||
| 101 | } | ||
| 102 | |||
| 98 | public ILandObject GetLandObject(int x, int y) | 103 | public ILandObject GetLandObject(int x, int y) |
| 99 | { | 104 | { |
| 100 | if (m_landManagementModule != null) | 105 | if (m_landManagementModule != null) |