aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-10-25 12:13:58 +0000
committerAdam Frisby2007-10-25 12:13:58 +0000
commit2048d611cf2ecccfbdb6b234c995e19d72ad03f2 (patch)
treea7cbc539a7e69cb1f8e70a094df8e26048d07375 /OpenSim/Region/Application/OpenSimMain.cs
parentCreated a generic RESTClient component, which simplifies querying for resourc... (diff)
downloadopensim-SC-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.zip
opensim-SC-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.tar.gz
opensim-SC-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.tar.bz2
opensim-SC-2048d611cf2ecccfbdb6b234c995e19d72ad03f2.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs3
1 files changed, 3 insertions, 0 deletions
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
60 public bool user_accounts; 60 public bool user_accounts;
61 public bool m_gridLocalAsset; 61 public bool m_gridLocalAsset;
62 62
63 private OpenSimController m_controller;
63 64
64 protected ModuleLoader m_moduleLoader; 65 protected ModuleLoader m_moduleLoader;
65 protected LocalLoginService m_loginService; 66 protected LocalLoginService m_loginService;
@@ -162,6 +163,8 @@ namespace OpenSim
162 163
163 base.StartUp(); 164 base.StartUp();
164 165
166 m_controller = new OpenSimController(this, m_httpServer);
167
165 if (m_sandbox) 168 if (m_sandbox)
166 { 169 {
167 LocalInventoryService inventoryService = new LocalInventoryService(); 170 LocalInventoryService inventoryService = new LocalInventoryService();