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
     /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it.
     /// </summary>
     [Serializable]
-    public class EventManager : ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule
+    public class EventManager : iScriptEngineFunctionModule
     {
         //
         // 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
     /// </summary>
     ///
     [Serializable]
-    public abstract class ScriptEngine : IRegionModule, IScriptModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule, IEventReceiver
+    public abstract class ScriptEngine : IRegionModule, IScriptModule, iScriptEngineFunctionModule, IEventReceiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -156,11 +156,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
             }
         }
 
-        ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ScriptEngine.EventManager()
-        {
-            return this.m_EventManager;
-        }
-
         public void ReadConfig()
         {
 #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 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
-using OpenSim.Region.ScriptEngine.Shared;
-
-
-namespace OpenSim.Region.ScriptEngine.Common
-{
-    public class ScriptServerInterfaces
-    {
-        public interface RemoteEvents
-        {
-            void touch_start(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient);
-            void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine);
-            void OnRemoveScript(uint localID, UUID itemID);
-            void state_exit(uint localID);
-            void touch(uint localID, uint originalID, Vector3 offsetPos,
-                            IClientAPI remoteClient);
-            void touch_end(uint localID, uint originalID, IClientAPI remoteClient);
-            void collision_start(uint localID, ColliderArgs col);
-            void collision(uint localID, ColliderArgs col);
-            void collision_end(uint localID, ColliderArgs col);
-//            void land_collision_start(uint localID, UUID itemID);
-//            void land_collision(uint localID, ColliderArgs col);
-//            void land_collision_end(uint localID, UUID itemID);
-            void timer(uint localID, UUID itemID);
-            void listen(uint localID, UUID itemID);
-//            void on_rez(uint localID, UUID itemID);
-//            void sensor(uint localID, UUID itemID);
-//            void no_sensor(uint localID, UUID itemID);
-            void control(uint localID, UUID itemID, UUID agentID, uint held, uint change);
-            void money(uint LocalID, UUID agentID, int amount);
-//            void email(uint localID, UUID itemID);
-            void at_target(uint localID, uint handle, Vector3 targetpos, Vector3 atpos);
-            void not_at_target(uint localID);
-            void at_rot_target(uint localID, UUID itemID);
-            void not_at_rot_target(uint localID, UUID itemID);
-//            void run_time_permissions(uint localID, UUID itemID);
-//            void changed(uint localID, UUID itemID);
-            void attach(uint localID, UUID itemID);
-            void dataserver(uint localID, UUID itemID);
-            void link_message(uint localID, UUID itemID);
-            void moving_start(uint localID, UUID itemID);
-            void moving_end(uint localID, UUID itemID);
-            void object_rez(uint localID, UUID itemID);
-            void remote_data(uint localID, UUID itemID);
-            void http_response(uint localID, UUID itemID);
-        }
-
-        public interface ServerRemotingObject
-        {
-            RemoteEvents Events();
-        }
-
-        public interface ScriptEngine
-        {
-            RemoteEvents EventManager();
-            void InitializeEngine(Scene Sceneworld, IConfigSource config, bool DontHookUp, ScriptManager newScriptManager);
-            ScriptManager GetScriptManager();
-        }
-    }
-}