ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

-copy LSL_Types tests from Common/ to Shared/

Browse Source 
-fix some whitespace/formatting
This commit is contained in:
Mike Mazur
2008-07-28 02:36:18 +00:00
parent 40bb4edf8c
commit 82fa53a486
8 changed files with 854 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
return new LSLInteger(u);
}
static public explicit operator LSLInteger(double d)
{
return new LSLInteger(d);
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
return new LSLInteger(i1.value / i2);
}
static public LSLFloat operator +(LSLInteger i1, double f)
{
return new LSLFloat((double)i1.value + f);
@@ -1510,7 +1510,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
return new LSLFloat(f.value / (double)i);
}
static public LSLFloat operator +(LSLFloat lhs, LSLFloat rhs)
{
return new LSLFloat(lhs.value + rhs.value);

12
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@@ -1280,7 +1280,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
{
return new LSLInteger(int.Parse(s));
}
static public implicit operator LSLInteger(uint u)
{
return new LSLInteger(u);
@@ -1347,7 +1347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
{
return new LSLInteger(-i.value);
}
public override bool Equals(Object o)
{
if (!(o is LSLInteger))
@@ -1362,7 +1362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
static public LSLInteger operator &(LSLInteger i1, LSLInteger i2)
{
int ret = i1.value & i2.value;
int ret = i1.value & i2.value;
return ret;
}
@@ -1505,7 +1505,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
{
return new LSLFloat(f.value * (double)i);
}
static public LSLFloat operator /(LSLFloat f, int i)
{
return new LSLFloat(f.value / (double)i);
@@ -1535,12 +1535,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
{
return new LSLFloat(-f.value);
}
static public implicit operator System.Double(LSLFloat f)
{
return f.value;
}
#endregion
#region Overriders