aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs22
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs2
3 files changed, 16 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index bac8bde..f941bc0 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -13,12 +13,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
13 13
14 public LSL2CSConverter() 14 public LSL2CSConverter()
15 { 15 {
16 16 // Only the types we need to convert
17 DataTypes.Add("void", "void"); 17 DataTypes.Add("void", "void");
18 DataTypes.Add("integer", "System.Int32"); 18 DataTypes.Add("integer", "int");
19 DataTypes.Add("float", "System.Double"); 19 DataTypes.Add("float", "double");
20 DataTypes.Add("string", "string"); 20 DataTypes.Add("string", "string");
21 DataTypes.Add("key", "System.String"); 21 DataTypes.Add("key", "string");
22 DataTypes.Add("vector", "LSL_Types.Vector3"); 22 DataTypes.Add("vector", "LSL_Types.Vector3");
23 DataTypes.Add("rotation", "LSL_Types.Quaternion"); 23 DataTypes.Add("rotation", "LSL_Types.Quaternion");
24 DataTypes.Add("list", "list"); 24 DataTypes.Add("list", "list");
@@ -230,13 +230,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
230 230
231 // Add namespace, class name and inheritance 231 // Add namespace, class name and inheritance
232 232
233 Return = "" + 233 Return = "";// +
234 "using System; " + 234 //"using System; " +
235 "using System.Collections.Generic; " + 235 //"using System.Collections.Generic; " +
236 "using System.Text; " + 236 //"using System.Text; " +
237 "using OpenSim.Region.ScriptEngine.Common; " + 237 //"using OpenSim.Region.ScriptEngine.Common; " +
238 "using integer = System.Int32; " + 238 //"using integer = System.Int32; " +
239 "using key = System.String; "; 239 //"using key = System.String; ";
240 240
241 //// Make a Using out of DataTypes 241 //// Make a Using out of DataTypes
242 //// Using integer = System.Int32; 242 //// Using integer = System.Int32;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index 9af9c82..d57b9eb 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -6,6 +6,10 @@ using OpenSim.Region.ScriptEngine.Common;
6using System.Threading; 6using System.Threading;
7using System.Reflection; 7using System.Reflection;
8using System.Runtime.Remoting.Lifetime; 8using System.Runtime.Remoting.Lifetime;
9using integer = System.Int32;
10using key = System.String;
11using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3;
12using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion;
9 13
10namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 14namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
11{ 15{
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index c724f01..4f65b13 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
180 catch (Exception e) 180 catch (Exception e)
181 { 181 {
182 // DISPLAY ERROR INWORLD 182 // DISPLAY ERROR INWORLD
183 string text = "Error executing script:\r\n"; 183 string text = "Error executing script function \"" + QIS.FunctionName + "\":\r\n";
184 if (e.InnerException != null) 184 if (e.InnerException != null)
185 { // Send inner exception 185 { // Send inner exception
186 text += e.InnerException.Message.ToString(); 186 text += e.InnerException.Message.ToString();