diff options
| author | SignpostMarv | 2012-09-06 11:45:52 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-09-08 00:44:27 +0100 |
| commit | e041f09750419f60c819ee7e7a99044fe43a811c (patch) | |
| tree | 85653d0f58246db0da634c3a84152d94259ea906 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-e041f09750419f60c819ee7e7a99044fe43a811c.zip opensim-SC_OLD-e041f09750419f60c819ee7e7a99044fe43a811c.tar.gz opensim-SC_OLD-e041f09750419f60c819ee7e7a99044fe43a811c.tar.bz2 opensim-SC_OLD-e041f09750419f60c819ee7e7a99044fe43a811c.tar.xz | |
refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 2e1e5b6..8b73cd9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2941,7 +2941,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2941 | ScenePresence presence = World.GetScenePresence(avatarId); | 2941 | ScenePresence presence = World.GetScenePresence(avatarId); |
| 2942 | if (presence != null) | 2942 | if (presence != null) |
| 2943 | { | 2943 | { |
| 2944 | LandData land = World.GetLandData((float)pos.X, (float)pos.Y); | 2944 | LandData land = World.GetLandData(pos); |
| 2945 | if ((land.Flags & (uint)ParcelFlags.AllowDamage) == (uint)ParcelFlags.AllowDamage) | 2945 | if ((land.Flags & (uint)ParcelFlags.AllowDamage) == (uint)ParcelFlags.AllowDamage) |
| 2946 | { | 2946 | { |
| 2947 | float health = presence.Health; | 2947 | float health = presence.Health; |