diff options
| author | Melanie | 2012-08-18 13:57:50 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-18 13:57:50 +0100 |
| commit | 5d43e27de29c104c3026b3c64ac3cc684f6353f2 (patch) | |
| tree | 25b2e737c25fd168eb28e9b8e082f993844329c3 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactoring for Vector3 operator & constructor tweaks (diff) | |
| download | opensim-SC-5d43e27de29c104c3026b3c64ac3cc684f6353f2.zip opensim-SC-5d43e27de29c104c3026b3c64ac3cc684f6353f2.tar.gz opensim-SC-5d43e27de29c104c3026b3c64ac3cc684f6353f2.tar.bz2 opensim-SC-5d43e27de29c104c3026b3c64ac3cc684f6353f2.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index da22f85..eee5d7b 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1556,7 +1556,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1556 | else if (p[i] is string) | 1556 | else if (p[i] is string) |
| 1557 | lsl_p[i] = new LSL_Types.LSLString((string)p[i]); | 1557 | lsl_p[i] = new LSL_Types.LSLString((string)p[i]); |
| 1558 | else if (p[i] is Vector3) | 1558 | else if (p[i] is Vector3) |
| 1559 | lsl_p[i] = new LSL_Types.Vector3(((Vector3)p[i]).X, ((Vector3)p[i]).Y, ((Vector3)p[i]).Z); | 1559 | lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]); |
| 1560 | else if (p[i] is Quaternion) | 1560 | else if (p[i] is Quaternion) |
| 1561 | lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W); | 1561 | lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W); |
| 1562 | else if (p[i] is float) | 1562 | else if (p[i] is float) |
| @@ -1582,7 +1582,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1582 | else if (p[i] is string) | 1582 | else if (p[i] is string) |
| 1583 | lsl_p[i] = new LSL_Types.LSLString((string)p[i]); | 1583 | lsl_p[i] = new LSL_Types.LSLString((string)p[i]); |
| 1584 | else if (p[i] is Vector3) | 1584 | else if (p[i] is Vector3) |
| 1585 | lsl_p[i] = new LSL_Types.Vector3(((Vector3)p[i]).X, ((Vector3)p[i]).Y, ((Vector3)p[i]).Z); | 1585 | lsl_p[i] = new LSL_Types.Vector3((Vector3)p[i]); |
| 1586 | else if (p[i] is Quaternion) | 1586 | else if (p[i] is Quaternion) |
| 1587 | lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W); | 1587 | lsl_p[i] = new LSL_Types.Quaternion(((Quaternion)p[i]).X, ((Quaternion)p[i]).Y, ((Quaternion)p[i]).Z, ((Quaternion)p[i]).W); |
| 1588 | else if (p[i] is float) | 1588 | else if (p[i] is float) |