Merge branch 'master' into vehicles

2 files changed, 11 insertions, 32 deletions

diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
index dedf876..b9d3f22 100644
--- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
 {
     public class MessageRegionModule : IMessageRegionLookup
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private MessageServerConfig m_cfg;
 
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
index 741a01b..5cdf191 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModuleComms.cs
@@ -25,41 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using log4net.Config;
-using Nini.Config;
+using System;
+using OpenMetaverse;
 
-namespace OpenSim.Grid.GridServer
+namespace OpenSim.Region.Framework.Interfaces
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            ArgvConfigSource argvSource = new ArgvConfigSource(args);
-            argvSource.AddSwitch("Startup", "console", "c");
-            argvSource.AddSwitch("Startup", "xmlfile", "x");
-
-            XmlConfigurator.Configure();
+    public delegate void ScriptCommand(UUID script, string id, string module, string command, string k);
 
-            GridServerBase app = new GridServerBase();
-
-            IConfig startupConfig = argvSource.Configs["Startup"];
-            if (startupConfig != null)
-            {
-                app.m_consoleType = startupConfig.GetString("console", "local");
-                app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
-            }
+    public interface IScriptModuleComms
+    {
+        event ScriptCommand OnScriptCommand;
 
-            app.m_configSource = argvSource;
+        void DispatchReply(UUID script, int code, string text, string k);
 
-//            if (args.Length > 0 && args[0] == "-setuponly")
-//            {
-//                app.Config();
-//            }
-//            else
-//            {
-                app.Startup();
-                app.Work();
-//            }
-        }
+        // For use ONLY by the script API
+        void RaiseEvent(UUID script, string id, string module, string command, string k);
     }
 }