diff options
author | Adam Frisby | 2007-12-03 07:06:46 +0000 |
---|---|---|
committer | Adam Frisby | 2007-12-03 07:06:46 +0000 |
commit | 981c97502a25c12473328e332bb0505f8c779d73 (patch) | |
tree | f60cf6bfad1350ab5f64dbb68bd2720ed74e20a0 /OpenSim/Region/Application/OpenSimMain.cs | |
parent | * Applied a few commits left on my laptop to OpenSimController. (diff) | |
download | opensim-SC_OLD-981c97502a25c12473328e332bb0505f8c779d73.zip opensim-SC_OLD-981c97502a25c12473328e332bb0505f8c779d73.tar.gz opensim-SC_OLD-981c97502a25c12473328e332bb0505f8c779d73.tar.bz2 opensim-SC_OLD-981c97502a25c12473328e332bb0505f8c779d73.tar.xz |
* Moved XMLRPC Controller to a Application Plugin. Requires testing.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 51a647d..9fd5bcc 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -61,8 +61,6 @@ namespace OpenSim | |||
61 | public bool m_gridLocalAsset; | 61 | public bool m_gridLocalAsset; |
62 | public bool m_SendChildAgentTaskData; | 62 | public bool m_SendChildAgentTaskData; |
63 | 63 | ||
64 | private OpenSimController m_controller; | ||
65 | |||
66 | protected LocalLoginService m_loginService; | 64 | protected LocalLoginService m_loginService; |
67 | 65 | ||
68 | protected string m_storageDll; | 66 | protected string m_storageDll; |
@@ -102,6 +100,11 @@ namespace OpenSim | |||
102 | set { m_config = value; } | 100 | set { m_config = value; } |
103 | } | 101 | } |
104 | 102 | ||
103 | public BaseHttpServer HttpServer | ||
104 | { | ||
105 | get { return m_httpServer; } | ||
106 | } | ||
107 | |||
105 | private ModuleLoader m_moduleLoader; | 108 | private ModuleLoader m_moduleLoader; |
106 | 109 | ||
107 | public ModuleLoader ModuleLoader | 110 | public ModuleLoader ModuleLoader |
@@ -279,8 +282,6 @@ namespace OpenSim | |||
279 | 282 | ||
280 | base.StartUp(); | 283 | base.StartUp(); |
281 | 284 | ||
282 | m_controller = new OpenSimController(this, m_httpServer); | ||
283 | |||
284 | if (m_sandbox) | 285 | if (m_sandbox) |
285 | { | 286 | { |
286 | LocalInventoryService inventoryService = new LocalInventoryService(); | 287 | LocalInventoryService inventoryService = new LocalInventoryService(); |