diff options
author | Mike Mazur | 2008-07-28 02:36:18 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-28 02:36:18 +0000 |
commit | 82fa53a486b16687131a0f85ba02b579b5456f3a (patch) | |
tree | 838c216f27f69af1428abbd26c3b0c7fdd984642 /OpenSim/Region | |
parent | Refresh LSLTypes.cs in Shared/ from the one in Common/, which was (diff) | |
download | opensim-SC_OLD-82fa53a486b16687131a0f85ba02b579b5456f3a.zip opensim-SC_OLD-82fa53a486b16687131a0f85ba02b579b5456f3a.tar.gz opensim-SC_OLD-82fa53a486b16687131a0f85ba02b579b5456f3a.tar.bz2 opensim-SC_OLD-82fa53a486b16687131a0f85ba02b579b5456f3a.tar.xz |
-copy LSL_Types tests from Common/ to Shared/
-fix some whitespace/formatting
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 5607706..bb1fe2f 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1285 | { | 1285 | { |
1286 | return new LSLInteger(u); | 1286 | return new LSLInteger(u); |
1287 | } | 1287 | } |
1288 | 1288 | ||
1289 | static public explicit operator LSLInteger(double d) | 1289 | static public explicit operator LSLInteger(double d) |
1290 | { | 1290 | { |
1291 | return new LSLInteger(d); | 1291 | return new LSLInteger(d); |
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1322 | { | 1322 | { |
1323 | return new LSLInteger(i1.value / i2); | 1323 | return new LSLInteger(i1.value / i2); |
1324 | } | 1324 | } |
1325 | 1325 | ||
1326 | static public LSLFloat operator +(LSLInteger i1, double f) | 1326 | static public LSLFloat operator +(LSLInteger i1, double f) |
1327 | { | 1327 | { |
1328 | return new LSLFloat((double)i1.value + f); | 1328 | return new LSLFloat((double)i1.value + f); |
@@ -1510,7 +1510,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1510 | { | 1510 | { |
1511 | return new LSLFloat(f.value / (double)i); | 1511 | return new LSLFloat(f.value / (double)i); |
1512 | } | 1512 | } |
1513 | 1513 | ||
1514 | static public LSLFloat operator +(LSLFloat lhs, LSLFloat rhs) | 1514 | static public LSLFloat operator +(LSLFloat lhs, LSLFloat rhs) |
1515 | { | 1515 | { |
1516 | return new LSLFloat(lhs.value + rhs.value); | 1516 | return new LSLFloat(lhs.value + rhs.value); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index 398e73d..89722da 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -1280,7 +1280,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1280 | { | 1280 | { |
1281 | return new LSLInteger(int.Parse(s)); | 1281 | return new LSLInteger(int.Parse(s)); |
1282 | } | 1282 | } |
1283 | 1283 | ||
1284 | static public implicit operator LSLInteger(uint u) | 1284 | static public implicit operator LSLInteger(uint u) |
1285 | { | 1285 | { |
1286 | return new LSLInteger(u); | 1286 | return new LSLInteger(u); |
@@ -1347,7 +1347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1347 | { | 1347 | { |
1348 | return new LSLInteger(-i.value); | 1348 | return new LSLInteger(-i.value); |
1349 | } | 1349 | } |
1350 | 1350 | ||
1351 | public override bool Equals(Object o) | 1351 | public override bool Equals(Object o) |
1352 | { | 1352 | { |
1353 | if (!(o is LSLInteger)) | 1353 | if (!(o is LSLInteger)) |
@@ -1362,7 +1362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1362 | 1362 | ||
1363 | static public LSLInteger operator &(LSLInteger i1, LSLInteger i2) | 1363 | static public LSLInteger operator &(LSLInteger i1, LSLInteger i2) |
1364 | { | 1364 | { |
1365 | int ret = i1.value & i2.value; | 1365 | int ret = i1.value & i2.value; |
1366 | return ret; | 1366 | return ret; |
1367 | } | 1367 | } |
1368 | 1368 | ||
@@ -1505,7 +1505,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1505 | { | 1505 | { |
1506 | return new LSLFloat(f.value * (double)i); | 1506 | return new LSLFloat(f.value * (double)i); |
1507 | } | 1507 | } |
1508 | 1508 | ||
1509 | static public LSLFloat operator /(LSLFloat f, int i) | 1509 | static public LSLFloat operator /(LSLFloat f, int i) |
1510 | { | 1510 | { |
1511 | return new LSLFloat(f.value / (double)i); | 1511 | return new LSLFloat(f.value / (double)i); |
@@ -1535,12 +1535,12 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
1535 | { | 1535 | { |
1536 | return new LSLFloat(-f.value); | 1536 | return new LSLFloat(-f.value); |
1537 | } | 1537 | } |
1538 | 1538 | ||
1539 | static public implicit operator System.Double(LSLFloat f) | 1539 | static public implicit operator System.Double(LSLFloat f) |
1540 | { | 1540 | { |
1541 | return f.value; | 1541 | return f.value; |
1542 | } | 1542 | } |
1543 | 1543 | ||
1544 | #endregion | 1544 | #endregion |
1545 | 1545 | ||
1546 | #region Overriders | 1546 | #region Overriders |