diff options
author | Melanie Thielker | 2008-09-01 23:33:12 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-01 23:33:12 +0000 |
commit | a5d2674a439df4f13285ab43bde194535bc31be1 (patch) | |
tree | 42351442f99ca46ac5f722346ed073ad2b9c0113 /OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |
parent | Another attempt at fixing XEngine llSetPrimitiveParams: Make it accept (diff) | |
download | opensim-SC_OLD-a5d2674a439df4f13285ab43bde194535bc31be1.zip opensim-SC_OLD-a5d2674a439df4f13285ab43bde194535bc31be1.tar.gz opensim-SC_OLD-a5d2674a439df4f13285ab43bde194535bc31be1.tar.bz2 opensim-SC_OLD-a5d2674a439df4f13285ab43bde194535bc31be1.tar.xz |
This is an attempt to fix the handling of constants in LSL.
It wraps constants in new LSLType(x), so that lists with
constant values are processed correctly. Contains changes to
the lsl.parser.cs that are not (yet) reflected in opensim-libs,
since this experimental patch affects XEngine only. Also contains
nuts.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 64334f1..babb759 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -1453,25 +1453,25 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1453 | return new LSLInteger(i1.value / i2); | 1453 | return new LSLInteger(i1.value / i2); |
1454 | } | 1454 | } |
1455 | 1455 | ||
1456 | static public LSLFloat operator +(LSLInteger i1, double f) | 1456 | // static public LSLFloat operator +(LSLInteger i1, double f) |
1457 | { | 1457 | // { |
1458 | return new LSLFloat((double)i1.value + f); | 1458 | // return new LSLFloat((double)i1.value + f); |
1459 | } | 1459 | // } |
1460 | 1460 | // | |
1461 | static public LSLFloat operator -(LSLInteger i1, double f) | 1461 | // static public LSLFloat operator -(LSLInteger i1, double f) |
1462 | { | 1462 | // { |
1463 | return new LSLFloat((double)i1.value - f); | 1463 | // return new LSLFloat((double)i1.value - f); |
1464 | } | 1464 | // } |
1465 | 1465 | // | |
1466 | static public LSLFloat operator *(LSLInteger i1, double f) | 1466 | // static public LSLFloat operator *(LSLInteger i1, double f) |
1467 | { | 1467 | // { |
1468 | return new LSLFloat((double)i1.value * f); | 1468 | // return new LSLFloat((double)i1.value * f); |
1469 | } | 1469 | // } |
1470 | 1470 | // | |
1471 | static public LSLFloat operator /(LSLInteger i1, double f) | 1471 | // static public LSLFloat operator /(LSLInteger i1, double f) |
1472 | { | 1472 | // { |
1473 | return new LSLFloat((double)i1.value / f); | 1473 | // return new LSLFloat((double)i1.value / f); |
1474 | } | 1474 | // } |
1475 | 1475 | ||
1476 | static public LSLInteger operator -(LSLInteger i) | 1476 | static public LSLInteger operator -(LSLInteger i) |
1477 | { | 1477 | { |