From 20a9bf08f51351e1e0a9de94f184ff56cd572665 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 1 May 2008 18:04:42 +0000 Subject: * Rolled back a few changes. --- OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | 2 +- OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 8 ++------ .../Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs | 2 +- OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Scripting') diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs index ccb2aa7..dbe2516 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs @@ -44,4 +44,4 @@ namespace OpenSim.Region.Environment.Scenes.Scripting string TouchName { get; set; } void SetText(string text, Vector3 color, double alpha); } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index a37ce53..4b1b56a 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs @@ -33,9 +33,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting { public class NullScriptHost : IScriptHost { - private readonly LLVector3 m_pos = new LLVector3(128, 128, 30); - - #region IScriptHost Members + private LLVector3 m_pos = new LLVector3(128, 128, 30); public string Name { @@ -85,7 +83,5 @@ namespace OpenSim.Region.Environment.Scenes.Scripting { Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); } - - #endregion } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs index cb0e1e8..b1ee519 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs @@ -35,4 +35,4 @@ namespace OpenSim.Region.Environment.Scenes.Scripting void Shutdown(); // void StartScript(string ScriptID, IScriptHost ObjectID); } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs index 0048e6b..6216e2c 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting { m_log.Error("[ScriptEngine]: " + "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + - e.StackTrace); + e.StackTrace.ToString()); } return ret; } @@ -116,4 +116,4 @@ namespace OpenSim.Region.Environment.Scenes.Scripting return ret; } } -} \ No newline at end of file +} -- cgit v1.1