aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2009-02-26 22:03:53 +0000
committerMW2009-02-26 22:03:53 +0000
commit4f072a0876223a63b296c31b2102d6a2fd537fcc (patch)
tree187e99fd9bd9c78538af7b30054b946a78378a6c /OpenSim
parentMoved the Initialisation of the CommunicationsManager to a ApplicationPlugin. (diff)
downloadopensim-SC_OLD-4f072a0876223a63b296c31b2102d6a2fd537fcc.zip
opensim-SC_OLD-4f072a0876223a63b296c31b2102d6a2fd537fcc.tar.gz
opensim-SC_OLD-4f072a0876223a63b296c31b2102d6a2fd537fcc.tar.bz2
opensim-SC_OLD-4f072a0876223a63b296c31b2102d6a2fd537fcc.tar.xz
Changed CreateCommsManagerPlugin so it handles external subclasses of OpenSimBase. This process of checking if it should be creating HG or normal CommunicationsManager needs to change.
So look out for a revert of this whole plugin soon.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs19
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index a5a4470..d99de7a 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -64,6 +64,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
64 protected OpenSimBase m_openSim; 64 protected OpenSimBase m_openSim;
65 65
66 protected BaseHttpServer m_httpServer; 66 protected BaseHttpServer m_httpServer;
67
67 protected CommunicationsManager m_commsManager; 68 protected CommunicationsManager m_commsManager;
68 protected GridInfoService m_gridInfoService; 69 protected GridInfoService m_gridInfoService;
69 protected IHyperlink HGServices = null; 70 protected IHyperlink HGServices = null;
@@ -114,34 +115,34 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
114 { 115 {
115 LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); 116 LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile);
116 117
117 if ((openSim is OpenSim) || (openSim is OpenSimBackground)) 118 if (openSim is HGOpenSimNode)
118 { 119 {
120 HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
121
119 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) 122 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
120 if (m_openSim.ConfigurationSettings.Standalone) 123 if (m_openSim.ConfigurationSettings.Standalone)
121 { 124 {
122 InitialiseStandaloneServices(libraryRootFolder); 125 InitialiseHGStandaloneServices(libraryRootFolder);
123 } 126 }
124 else 127 else
125 { 128 {
126 // We are in grid mode 129 // We are in grid mode
127 InitialiseGridServices(libraryRootFolder); 130 InitialiseHGGridServices(libraryRootFolder);
128 } 131 }
132 hgNode.HGServices = HGServices;
129 } 133 }
130 else if (openSim is HGOpenSimNode) 134 else
131 { 135 {
132 HGOpenSimNode hgNode = (HGOpenSimNode)openSim;
133
134 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) 136 // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false)
135 if (m_openSim.ConfigurationSettings.Standalone) 137 if (m_openSim.ConfigurationSettings.Standalone)
136 { 138 {
137 InitialiseHGStandaloneServices(libraryRootFolder); 139 InitialiseStandaloneServices(libraryRootFolder);
138 } 140 }
139 else 141 else
140 { 142 {
141 // We are in grid mode 143 // We are in grid mode
142 InitialiseHGGridServices(libraryRootFolder); 144 InitialiseGridServices(libraryRootFolder);
143 } 145 }
144 hgNode.HGServices = HGServices;
145 } 146 }
146 147
147 openSim.CommunicationsManager = m_commsManager; 148 openSim.CommunicationsManager = m_commsManager;