| View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] |
| ID | Project | Category | View Status | Date Submitted | Last Update |
| 0006239 | opensim | [REGION] Scripting Engine | public | 2012-08-22 15:02 | 2013-02-11 15:51 |
|
| Reporter | SignpostMarv | |
| Assigned To | melanie | |
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | |
| Platform | | OS | | OS Version | |
| Product Version | master (dev code) | |
| Target Version | | Fixed in Version | | |
|
| Summary | 0006239: region module functions get the OMV types not the LSL types |
| Description | Found that region module functions get the OMV types instead of the LSL types, so if one instantiates an LSL list inside a region module function, it doesn't work.
Attached patch uses the implicit operators to return the LSL Vector3 and Quaternion types when the respective OMV types are in an LSL List. |
| Tags | No tags attached. |
|
| Git Revision or version number | |
| Run Mode | Standalone (1 Region) |
| Physics Engine | BasicPhysics |
| Environment | .NET / Windows32 |
| Mono Version | None |
| Viewer | |
|
| Attached Files |  Vector3-Quaternion-region-modules.patch [^] (2,159 bytes) 2012-08-22 15:02 [Show Content] [Hide Content]From 1db71ad99f0689c7a526f4c8a2f1a0235be930f9 Mon Sep 17 00:00:00 2001
From: SignpostMarv <github@signpostmarv.name>
Date: Wed, 22 Aug 2012 15:59:49 +0100
Subject: [PATCH] region module functions get the OMV types not the LSL types
---
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 2a01e9c..a89f075 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -631,8 +631,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
public LSL_Types.Vector3 GetVector3Item(int itemIndex)
{
- if(m_data[itemIndex] is LSL_Types.Vector3)
+ if (m_data[itemIndex] is LSL_Types.Vector3)
return (LSL_Types.Vector3)m_data[itemIndex];
+ else if (m_data[itemIndex] is OMV_Vector3)
+ return (LSL_Types.Vector3)((OMV_Vector3)m_data[itemIndex]);
else
throw new InvalidCastException(string.Format(
"{0} expected but {1} given",
@@ -643,7 +645,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
public LSL_Types.Quaternion GetQuaternionItem(int itemIndex)
{
- return (LSL_Types.Quaternion)m_data[itemIndex];
+ if (m_data[itemIndex] is LSL_Types.Quaternion)
+ return (LSL_Types.Quaternion)m_data[itemIndex];
+ else if (m_data[itemIndex] is OMV_Quaternion)
+ return (LSL_Types.Quaternion)((OMV_Quaternion)m_data[itemIndex]);
+ else
+ throw new InvalidCastException(string.Format(
+ "{0} expected but {1} given",
+ typeof(LSL_Types.Quaternion).Name,
+ m_data[itemIndex] != null ?
+ m_data[itemIndex].GetType().Name : "null"));
}
public LSL_Types.key GetKeyItem(int itemIndex)
--
1.7.11.msysgit.1
|
|
Relationships 
Relationships 