From 83d5df39791c4778e791f9bdb0fca0c30a20a793 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sun, 26 Aug 2007 14:04:22 +0000
Subject: in-world run-time error-message no-w con-tains function-name.

---
 .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs   | 22 +++++++++++-----------
 .../DotNetEngine/Compiler/LSL/LSL_BaseClass.cs     |  4 ++++
 .../ScriptEngine/DotNetEngine/EventQueueManager.cs |  2 +-
 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
 
         public LSL2CSConverter()
         {
-            
+            // Only the types we need to convert
             DataTypes.Add("void", "void");
-            DataTypes.Add("integer", "System.Int32");
-            DataTypes.Add("float", "System.Double");
+            DataTypes.Add("integer", "int");
+            DataTypes.Add("float", "double");
             DataTypes.Add("string", "string");
-            DataTypes.Add("key", "System.String");
+            DataTypes.Add("key", "string");
             DataTypes.Add("vector", "LSL_Types.Vector3");
             DataTypes.Add("rotation", "LSL_Types.Quaternion");
             DataTypes.Add("list", "list");
@@ -230,13 +230,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
 
             // Add namespace, class name and inheritance
 
-            Return = "" +
-            "using System; " +
-            "using System.Collections.Generic; " +
-            "using System.Text; " +
-            "using OpenSim.Region.ScriptEngine.Common; " +
-            "using integer = System.Int32; " +
-            "using key = System.String; ";
+            Return = "";// +
+            //"using System; " +
+            //"using System.Collections.Generic; " +
+            //"using System.Text; " +
+            //"using OpenSim.Region.ScriptEngine.Common; " +
+            //"using integer = System.Int32; " +
+            //"using key = System.String; ";
 
             //// Make a Using out of DataTypes
             //// 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;
 using System.Threading;
 using System.Reflection;
 using System.Runtime.Remoting.Lifetime;
+using integer = System.Int32;
+using key = System.String;
+using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3;
+using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion;
 
 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
 {
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
                                 catch (Exception e)
                                 {
                                     // DISPLAY ERROR INWORLD
-                                    string text = "Error executing script:\r\n";
+                                    string text = "Error executing script function \"" + QIS.FunctionName + "\":\r\n";
                                     if (e.InnerException != null)
                                     { // Send inner exception
                                         text += e.InnerException.Message.ToString();
-- 
cgit v1.1