diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 713f832..5aa0678 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -11737,7 +11737,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 11737 | { | 11737 | { |
| 11738 | Tri t1 = new Tri(); | 11738 | Tri t1 = new Tri(); |
| 11739 | Tri t2 = new Tri(); | 11739 | Tri t2 = new Tri(); |
| 11740 | 11740 | ||
| 11741 | Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]); | 11741 | Vector3 p1 = new Vector3(x-1, y-1, (float)heightfield[x-1, y-1]); |
| 11742 | Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]); | 11742 | Vector3 p2 = new Vector3(x, y-1, (float)heightfield[x, y-1]); |
| 11743 | Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]); | 11743 | Vector3 p3 = new Vector3(x, y, (float)heightfield[x, y]); |
| @@ -11778,7 +11778,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 11778 | // sometimes | 11778 | // sometimes |
| 11779 | if (Math.Abs(b) < 0.000001) | 11779 | if (Math.Abs(b) < 0.000001) |
| 11780 | continue; | 11780 | continue; |
| 11781 | 11781 | ||
| 11782 | double r = a / b; | 11782 | double r = a / b; |
| 11783 | 11783 | ||
| 11784 | // ray points away from plane | 11784 | // ray points away from plane |