aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scripting
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scripting')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs20
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs28
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs14
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs38
4 files changed, 50 insertions, 50 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index 7cf9cb7..dbd43be 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -1,20 +1,18 @@
1using System; 1using Axiom.Math;
2using System.Collections.Generic; 2using libsecondlife;
3using System.Text; 3
4using libsecondlife;
5
6namespace OpenSim.Region.Environment.Scenes.Scripting 4namespace OpenSim.Region.Environment.Scenes.Scripting
7{ 5{
8 public interface IScriptHost 6 public interface IScriptHost
9 { 7 {
10 string Name { get; set;} 8 string Name { get; set; }
11 string SitName{ get; set;} 9 string SitName { get; set; }
12 string TouchName { get; set;} 10 string TouchName { get; set; }
13 string Description { get; set; } 11 string Description { get; set; }
14 LLUUID UUID { get; } 12 LLUUID UUID { get; }
15 LLUUID ObjectOwner { get;} 13 LLUUID ObjectOwner { get; }
16 LLUUID ObjectCreator { get; } 14 LLUUID ObjectCreator { get; }
17 LLVector3 AbsolutePosition { get; } 15 LLVector3 AbsolutePosition { get; }
18 void SetText(string text, Axiom.Math.Vector3 color, double alpha); 16 void SetText(string text, Vector3 color, double alpha);
19 } 17 }
20} 18} \ 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 875e4cb..6876cfb 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -1,14 +1,13 @@
1using System; 1using System;
2using System.Collections.Generic; 2using Axiom.Math;
3using System.Text; 3using libsecondlife;
4using libsecondlife; 4
5
6namespace OpenSim.Region.Environment.Scenes.Scripting 5namespace OpenSim.Region.Environment.Scenes.Scripting
7{ 6{
8 public class NullScriptHost : IScriptHost 7 public class NullScriptHost : IScriptHost
9 { 8 {
10 9 private LLVector3 m_pos = new LLVector3(128, 128, 30);
11 LLVector3 m_pos = new LLVector3( 128, 128, 30 ); 10
12 public string Name 11 public string Name
13 { 12 {
14 get { return "Object"; } 13 get { return "Object"; }
@@ -39,18 +38,23 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
39 } 38 }
40 39
41 public LLUUID ObjectOwner 40 public LLUUID ObjectOwner
42 { get { return LLUUID.Zero; } } 41 {
42 get { return LLUUID.Zero; }
43 }
43 44
44 public LLUUID ObjectCreator { get { return LLUUID.Zero; } } 45 public LLUUID ObjectCreator
46 {
47 get { return LLUUID.Zero; }
48 }
45 49
46 public LLVector3 AbsolutePosition 50 public LLVector3 AbsolutePosition
47 { 51 {
48 get { return m_pos; } 52 get { return m_pos; }
49 } 53 }
50 54
51 public void SetText(string text, Axiom.Math.Vector3 color, double alpha) 55 public void SetText(string text, Vector3 color, double alpha)
52 { 56 {
53 Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); 57 Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text);
54 } 58 }
55 } 59 }
56} 60} \ 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 5e8ff87..06bedaf 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -26,18 +26,16 @@
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using OpenSim.Framework.Console;
30using System.Collections.Generic; 30
31using System.Text; 31//TODO: WHERE TO PLACE THIS?
32using OpenSim.Region.Environment.Scenes.Scripting; 32
33
34//TODO: WHERE TO PLACE THIS?
35namespace OpenSim.Region.Environment.Scenes.Scripting 33namespace OpenSim.Region.Environment.Scenes.Scripting
36{ 34{
37 public interface ScriptEngineInterface 35 public interface ScriptEngineInterface
38 { 36 {
39 void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger); 37 void InitializeEngine(Scene Sceneworld, LogBase logger);
40 void Shutdown(); 38 void Shutdown();
41// void StartScript(string ScriptID, IScriptHost ObjectID); 39// void StartScript(string ScriptID, IScriptHost ObjectID);
42 } 40 }
43} 41} \ 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 83bd0ab..5355388 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -26,18 +26,18 @@
26* 26*
27*/ 27*/
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using System.Collections.Generic; 30using System.IO;
31using System.IO; 31using System.Reflection;
32using System.Text; 32using OpenSim.Framework.Console;
33using System.Reflection; 33
34
35namespace OpenSim.Region.Environment.Scenes.Scripting 34namespace OpenSim.Region.Environment.Scenes.Scripting
36{ 35{
37 public class ScriptEngineLoader 36 public class ScriptEngineLoader
38 { 37 {
39 private OpenSim.Framework.Console.LogBase m_log; 38 private LogBase m_log;
40 public ScriptEngineLoader(OpenSim.Framework.Console.LogBase logger) 39
40 public ScriptEngineLoader(LogBase logger)
41 { 41 {
42 m_log = logger; 42 m_log = logger;
43 } 43 }
@@ -47,12 +47,16 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
47 ScriptEngineInterface ret = null; 47 ScriptEngineInterface ret = null;
48 try 48 try
49 { 49 {
50 ret = LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"), 50 ret =
51 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine"); 51 LoadAndInitAssembly(
52 Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
53 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
52 } 54 }
53 catch (Exception e) 55 catch (Exception e)
54 { 56 {
55 m_log.Error("ScriptEngine", "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + e.StackTrace.ToString()); 57 m_log.Error("ScriptEngine",
58 "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
59 e.StackTrace.ToString());
56 } 60 }
57 return ret; 61 return ret;
58 } 62 }
@@ -107,18 +111,14 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
107 ScriptEngineInterface ret; 111 ScriptEngineInterface ret;
108 //try 112 //try
109 //{ 113 //{
110 ret = (ScriptEngineInterface)Activator.CreateInstance(t); 114 ret = (ScriptEngineInterface) Activator.CreateInstance(t);
111 //} 115 //}
112 //catch (Exception e) 116 //catch (Exception e)
113 //{ 117 //{
114 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString()); 118 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
115 //} 119 //}
116 120
117 return ret; 121 return ret;
118 122 }
119
120 }
121
122
123 } 123 }
124} 124} \ No newline at end of file