diff options
author | Melanie Thielker | 2008-10-12 01:00:26 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-12 01:00:26 +0000 |
commit | 11477db59ebf8b97b6246ca43349bed5d6b900b8 (patch) | |
tree | 3fc07ec701aa8a72962e01c4defea27c6b0c100c /OpenSim/Region | |
parent | LLUDP Client View (diff) | |
download | opensim-SC-11477db59ebf8b97b6246ca43349bed5d6b900b8.zip opensim-SC-11477db59ebf8b97b6246ca43349bed5d6b900b8.tar.gz opensim-SC-11477db59ebf8b97b6246ca43349bed5d6b900b8.tar.bz2 opensim-SC-11477db59ebf8b97b6246ca43349bed5d6b900b8.tar.xz |
Fix LSL bitwise Or
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 14e6901..f3ad288 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -1608,6 +1608,12 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1608 | return ret; | 1608 | return ret; |
1609 | } | 1609 | } |
1610 | 1610 | ||
1611 | static public LSLInteger operator |(LSLInteger i1, LSLInteger i2) | ||
1612 | { | ||
1613 | int ret = i1.value | i2.value; | ||
1614 | return ret; | ||
1615 | } | ||
1616 | |||
1611 | public static LSLInteger operator ++(LSLInteger i) | 1617 | public static LSLInteger operator ++(LSLInteger i) |
1612 | { | 1618 | { |
1613 | i.value++; | 1619 | i.value++; |