aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/GridServerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 6c3584d..f118c90 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.GridServer
39{ 39{
40 /// <summary> 40 /// <summary>
41 /// </summary> 41 /// </summary>
42 public class GridServerBase : BaseOpenSimServer, IGridCore 42 public class GridServerBase : BaseOpenSimServer, IUGAIMCore
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
@@ -163,6 +163,10 @@ namespace OpenSim.Grid.GridServer
163 163
164 m_gridRestModule = new GridRestModule(); 164 m_gridRestModule = new GridRestModule();
165 m_gridRestModule.Initialise(m_version, m_gridDBService, this, m_config); 165 m_gridRestModule.Initialise(m_version, m_gridDBService, this, m_config);
166
167 m_gridMessageModule.PostInitialise();
168 m_gridXmlRpcModule.PostInitialise();
169 m_gridRestModule.PostInitialise();
166 } 170 }
167 171
168 public void CheckSims(object sender, ElapsedEventArgs e) 172 public void CheckSims(object sender, ElapsedEventArgs e)
@@ -207,8 +211,8 @@ namespace OpenSim.Grid.GridServer
207 foreach (IGridPlugin plugin in m_plugins) plugin.Dispose(); 211 foreach (IGridPlugin plugin in m_plugins) plugin.Dispose();
208 } 212 }
209 213
210 #region IGridCore 214 #region IUGAIMCore
211 private readonly Dictionary<Type, object> m_gridInterfaces = new Dictionary<Type, object>(); 215 private readonly Dictionary<Type, object> m_moduleInterfaces = new Dictionary<Type, object>();
212 216
213 /// <summary> 217 /// <summary>
214 /// Register an Module interface. 218 /// Register an Module interface.
@@ -217,20 +221,20 @@ namespace OpenSim.Grid.GridServer
217 /// <param name="iface"></param> 221 /// <param name="iface"></param>
218 public void RegisterInterface<T>(T iface) 222 public void RegisterInterface<T>(T iface)
219 { 223 {
220 lock (m_gridInterfaces) 224 lock (m_moduleInterfaces)
221 { 225 {
222 if (!m_gridInterfaces.ContainsKey(typeof(T))) 226 if (!m_moduleInterfaces.ContainsKey(typeof(T)))
223 { 227 {
224 m_gridInterfaces.Add(typeof(T), iface); 228 m_moduleInterfaces.Add(typeof(T), iface);
225 } 229 }
226 } 230 }
227 } 231 }
228 232
229 public bool TryGet<T>(out T iface) 233 public bool TryGet<T>(out T iface)
230 { 234 {
231 if (m_gridInterfaces.ContainsKey(typeof(T))) 235 if (m_moduleInterfaces.ContainsKey(typeof(T)))
232 { 236 {
233 iface = (T)m_gridInterfaces[typeof(T)]; 237 iface = (T)m_moduleInterfaces[typeof(T)];
234 return true; 238 return true;
235 } 239 }
236 iface = default(T); 240 iface = default(T);
@@ -239,7 +243,7 @@ namespace OpenSim.Grid.GridServer
239 243
240 public T Get<T>() 244 public T Get<T>()
241 { 245 {
242 return (T)m_gridInterfaces[typeof(T)]; 246 return (T)m_moduleInterfaces[typeof(T)];
243 } 247 }
244 248
245 public BaseHttpServer GetHttpServer() 249 public BaseHttpServer GetHttpServer()