aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs91
3 files changed, 2 insertions, 98 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index deb995b..8293fae 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
43 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it. 43 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it.
44 /// </summary> 44 /// </summary>
45 [Serializable] 45 [Serializable]
46 public class EventManager : ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule 46 public class EventManager : iScriptEngineFunctionModule
47 { 47 {
48 // 48 //
49 // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine". 49 // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine".
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index 88f7b41..f259ec1 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
44 /// </summary> 44 /// </summary>
45 /// 45 ///
46 [Serializable] 46 [Serializable]
47 public abstract class ScriptEngine : IRegionModule, IScriptModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule, IEventReceiver 47 public abstract class ScriptEngine : IRegionModule, IScriptModule, iScriptEngineFunctionModule, IEventReceiver
48 { 48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
@@ -156,11 +156,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
156 } 156 }
157 } 157 }
158 158
159 ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ScriptEngine.EventManager()
160 {
161 return this.m_EventManager;
162 }
163
164 public void ReadConfig() 159 public void ReadConfig()
165 { 160 {
166#if DEBUG 161#if DEBUG
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
deleted file mode 100644
index 14eef15..0000000
--- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
+++ /dev/null
@@ -1,91 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.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
28using OpenMetaverse;
29using Nini.Config;
30using OpenSim.Framework;
31using OpenSim.Region.Environment.Scenes;
32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
33using OpenSim.Region.ScriptEngine.Shared;
34
35
36namespace OpenSim.Region.ScriptEngine.Common
37{
38 public class ScriptServerInterfaces
39 {
40 public interface RemoteEvents
41 {
42 void touch_start(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient);
43 void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine);
44 void OnRemoveScript(uint localID, UUID itemID);
45 void state_exit(uint localID);
46 void touch(uint localID, uint originalID, Vector3 offsetPos,
47 IClientAPI remoteClient);
48 void touch_end(uint localID, uint originalID, IClientAPI remoteClient);
49 void collision_start(uint localID, ColliderArgs col);
50 void collision(uint localID, ColliderArgs col);
51 void collision_end(uint localID, ColliderArgs col);
52// void land_collision_start(uint localID, UUID itemID);
53// void land_collision(uint localID, ColliderArgs col);
54// void land_collision_end(uint localID, UUID itemID);
55 void timer(uint localID, UUID itemID);
56 void listen(uint localID, UUID itemID);
57// void on_rez(uint localID, UUID itemID);
58// void sensor(uint localID, UUID itemID);
59// void no_sensor(uint localID, UUID itemID);
60 void control(uint localID, UUID itemID, UUID agentID, uint held, uint change);
61 void money(uint LocalID, UUID agentID, int amount);
62// void email(uint localID, UUID itemID);
63 void at_target(uint localID, uint handle, Vector3 targetpos, Vector3 atpos);
64 void not_at_target(uint localID);
65 void at_rot_target(uint localID, UUID itemID);
66 void not_at_rot_target(uint localID, UUID itemID);
67// void run_time_permissions(uint localID, UUID itemID);
68// void changed(uint localID, UUID itemID);
69 void attach(uint localID, UUID itemID);
70 void dataserver(uint localID, UUID itemID);
71 void link_message(uint localID, UUID itemID);
72 void moving_start(uint localID, UUID itemID);
73 void moving_end(uint localID, UUID itemID);
74 void object_rez(uint localID, UUID itemID);
75 void remote_data(uint localID, UUID itemID);
76 void http_response(uint localID, UUID itemID);
77 }
78
79 public interface ServerRemotingObject
80 {
81 RemoteEvents Events();
82 }
83
84 public interface ScriptEngine
85 {
86 RemoteEvents EventManager();
87 void InitializeEngine(Scene Sceneworld, IConfigSource config, bool DontHookUp, ScriptManager newScriptManager);
88 ScriptManager GetScriptManager();
89 }
90 }
91}