OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

in-world run-time error-message no-w con-tains function-name.

afrisby
Tedd Hansen 2007-08-26 14:04:22 +00:00
parent ebb0099816
commit 83d5df3979
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
View File

@ -13,12 +13,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
public LSL2CSConverter() public LSL2CSConverter()
{ {
// Only the types we need to convert
DataTypes.Add("void", "void"); DataTypes.Add("void", "void");
DataTypes.Add("integer", "System.Int32"); DataTypes.Add("integer", "int");
DataTypes.Add("float", "System.Double"); DataTypes.Add("float", "double");
DataTypes.Add("string", "string"); DataTypes.Add("string", "string");
DataTypes.Add("key", "System.String"); DataTypes.Add("key", "string");
DataTypes.Add("vector", "LSL_Types.Vector3"); DataTypes.Add("vector", "LSL_Types.Vector3");
DataTypes.Add("rotation", "LSL_Types.Quaternion"); DataTypes.Add("rotation", "LSL_Types.Quaternion");
DataTypes.Add("list", "list"); DataTypes.Add("list", "list");
@ -230,13 +230,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// Add namespace, class name and inheritance // Add namespace, class name and inheritance
Return = "" + Return = "";// +
"using System; " + //"using System; " +
"using System.Collections.Generic; " + //"using System.Collections.Generic; " +
"using System.Text; " + //"using System.Text; " +
"using OpenSim.Region.ScriptEngine.Common; " + //"using OpenSim.Region.ScriptEngine.Common; " +
"using integer = System.Int32; " + //"using integer = System.Int32; " +
"using key = System.String; "; //"using key = System.String; ";
//// Make a Using out of DataTypes //// Make a Using out of DataTypes
//// Using integer = System.Int32; //// Using integer = System.Int32;

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
View File

@ -6,6 +6,10 @@ using OpenSim.Region.ScriptEngine.Common;
using System.Threading; using System.Threading;
using System.Reflection; using System.Reflection;
using System.Runtime.Remoting.Lifetime; 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 namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
{ {

2
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
View File

@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
catch (Exception e) catch (Exception e)
{ {
// DISPLAY ERROR INWORLD // DISPLAY ERROR INWORLD
string text = "Error executing script:\r\n"; string text = "Error executing script function \"" + QIS.FunctionName + "\":\r\n";
if (e.InnerException != null) if (e.InnerException != null)
{ // Send inner exception { // Send inner exception
text += e.InnerException.Message.ToString(); text += e.InnerException.Message.ToString();