diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Scenes/Scripting | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to '')
4 files changed, 6 insertions, 10 deletions
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 | |||
44 | string TouchName { get; set; } | 44 | string TouchName { get; set; } |
45 | void SetText(string text, Vector3 color, double alpha); | 45 | void SetText(string text, Vector3 color, double alpha); |
46 | } | 46 | } |
47 | } \ No newline at end of file | 47 | } |
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 | |||
33 | { | 33 | { |
34 | public class NullScriptHost : IScriptHost | 34 | public class NullScriptHost : IScriptHost |
35 | { | 35 | { |
36 | private readonly LLVector3 m_pos = new LLVector3(128, 128, 30); | 36 | private LLVector3 m_pos = new LLVector3(128, 128, 30); |
37 | |||
38 | #region IScriptHost Members | ||
39 | 37 | ||
40 | public string Name | 38 | public string Name |
41 | { | 39 | { |
@@ -85,7 +83,5 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
85 | { | 83 | { |
86 | Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); | 84 | Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); |
87 | } | 85 | } |
88 | |||
89 | #endregion | ||
90 | } | 86 | } |
91 | } \ No newline at end of file | 87 | } |
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 | |||
35 | void Shutdown(); | 35 | void Shutdown(); |
36 | // void StartScript(string ScriptID, IScriptHost ObjectID); | 36 | // void StartScript(string ScriptID, IScriptHost ObjectID); |
37 | } | 37 | } |
38 | } \ No newline at end of file | 38 | } |
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 | |||
51 | { | 51 | { |
52 | m_log.Error("[ScriptEngine]: " + | 52 | m_log.Error("[ScriptEngine]: " + |
53 | "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + | 53 | "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + |
54 | e.StackTrace); | 54 | e.StackTrace.ToString()); |
55 | } | 55 | } |
56 | return ret; | 56 | return ret; |
57 | } | 57 | } |
@@ -116,4 +116,4 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
116 | return ret; | 116 | return ret; |
117 | } | 117 | } |
118 | } | 118 | } |
119 | } \ No newline at end of file | 119 | } |