aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorTedd Hansen2007-08-13 19:39:51 +0000
committerTedd Hansen2007-08-13 19:39:51 +0000
commit876f71cf931b887a3132ce719a4cc539b77cbca9 (patch)
treea1b31e54c85218deedcc257ad693e0ff64d56f81 /OpenSim/Region/ScriptEngine
parentSetting culture for startup thread to invariant. Config now read correctly on... (diff)
downloadopensim-SC_OLD-876f71cf931b887a3132ce719a4cc539b77cbca9.zip
opensim-SC_OLD-876f71cf931b887a3132ce719a4cc539b77cbca9.tar.gz
opensim-SC_OLD-876f71cf931b887a3132ce719a4cc539b77cbca9.tar.bz2
opensim-SC_OLD-876f71cf931b887a3132ce719a4cc539b77cbca9.tar.xz
(DotNet) ScriptEngine is now loaded and added to Scene during startup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs40
2 files changed, 1 insertions, 41 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index a1e2e1d..8f90483 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -32,7 +32,7 @@ using System.Text;
32 32
33namespace OpenSim.Region.ScriptEngine.DotNetEngine 33namespace OpenSim.Region.ScriptEngine.DotNetEngine
34{ 34{
35 public class ScriptEngine : ScriptEngineInterface 35 public class ScriptEngine : OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface
36 { 36 {
37 // 37 //
38 // This is the root object for ScriptEngine 38 // This is the root object for ScriptEngine
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
deleted file mode 100644
index bc735c9..0000000
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
+++ /dev/null
@@ -1,40 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28/* Original code: Tedd Hansen */
29using System;
30using System.Collections.Generic;
31using System.Text;
32//TODO: WHERE TO PLACE THIS?
33namespace OpenSim.Region.ScriptEngine.DotNetEngine
34{
35 interface ScriptEngineInterface
36 {
37 void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld);
38 void Shutdown();
39 }
40}