From 2048d611cf2ecccfbdb6b234c995e19d72ad03f2 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 25 Oct 2007 12:13:58 +0000
Subject: * Added XMLRPC Controller Module to OpenSimMain which allows XML-RPC
 queries to be sent to the core application. * Disabled by default, but has
 two functions so far -- shutdown (timed or now), and create-region. * Added
 SendGeneralAlert function to SceneManager allowing all-user alerts to be sent
 from OpenSimMain.

---
 OpenSim/Region/Application/OpenSimMain.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Application/OpenSimMain.cs')

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 84c8bff..a345334 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -60,6 +60,7 @@ namespace OpenSim
         public bool user_accounts;
         public bool m_gridLocalAsset;
 
+        private OpenSimController m_controller;
 
         protected ModuleLoader m_moduleLoader;
         protected LocalLoginService m_loginService;
@@ -162,6 +163,8 @@ namespace OpenSim
 
             base.StartUp();
 
+            m_controller = new OpenSimController(this, m_httpServer);
+
             if (m_sandbox)
             {
                 LocalInventoryService inventoryService = new LocalInventoryService();
-- 
cgit v1.1