aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridMessagingModule.cs1
-rw-r--r--OpenSim/Grid/GridServer/GridRestModule.cs1
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridXmlRpcModule.cs1
-rw-r--r--OpenSim/Grid/GridServer/IGridMessagingMapper.cs3
-rw-r--r--OpenSim/Grid/GridServer/IUGAIMCore.cs3
6 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/GridMessagingModule.cs b/OpenSim/Grid/GridServer/GridMessagingModule.cs
index 14ce727..7194ba4 100644
--- a/OpenSim/Grid/GridServer/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer/GridMessagingModule.cs
@@ -34,6 +34,7 @@ using Nwc.XmlRpc;
34using log4net; 34using log4net;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Grid.Framework;
37 38
38namespace OpenSim.Grid.GridServer 39namespace OpenSim.Grid.GridServer
39{ 40{
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs
index 7d3bd18..2ec7cdb 100644
--- a/OpenSim/Grid/GridServer/GridRestModule.cs
+++ b/OpenSim/Grid/GridServer/GridRestModule.cs
@@ -37,6 +37,7 @@ using OpenSim.Data;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Grid.Framework;
40 41
41namespace OpenSim.Grid.GridServer 42namespace OpenSim.Grid.GridServer
42{ 43{
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index f118c90..7b47aab 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -34,6 +34,7 @@ using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Grid.Framework;
37 38
38namespace OpenSim.Grid.GridServer 39namespace OpenSim.Grid.GridServer
39{ 40{
@@ -155,6 +156,9 @@ namespace OpenSim.Grid.GridServer
155 m_gridDBService = new GridDBService(); 156 m_gridDBService = new GridDBService();
156 m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); 157 m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
157 158
159 //Register the database access service so modules can fetch it
160 // RegisterInterface<GridDBService>(m_gridDBService);
161
158 m_gridMessageModule = new GridMessagingModule(); 162 m_gridMessageModule = new GridMessagingModule();
159 m_gridMessageModule.Initialise(m_version, m_gridDBService, this, m_config); 163 m_gridMessageModule.Initialise(m_version, m_gridDBService, this, m_config);
160 164
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
index e0e16b5..d69f079 100644
--- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
@@ -38,6 +38,7 @@ using OpenSim.Data;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Grid.Framework;
41 42
42namespace OpenSim.Grid.GridServer 43namespace OpenSim.Grid.GridServer
43{ 44{
diff --git a/OpenSim/Grid/GridServer/IGridMessagingMapper.cs b/OpenSim/Grid/GridServer/IGridMessagingMapper.cs
index 0183ad5..5475029 100644
--- a/OpenSim/Grid/GridServer/IGridMessagingMapper.cs
+++ b/OpenSim/Grid/GridServer/IGridMessagingMapper.cs
@@ -31,10 +31,11 @@ using OpenSim.Framework.Servers;
31 31
32namespace OpenSim.Grid.GridServer 32namespace OpenSim.Grid.GridServer
33{ 33{
34 /*
34 public interface IGridMessagingMapper 35 public interface IGridMessagingMapper
35 { 36 {
36 List<MessageServerInfo> GetMessageServersList(); 37 List<MessageServerInfo> GetMessageServersList();
37 void RegisterMessageServer(MessageServerInfo m); 38 void RegisterMessageServer(MessageServerInfo m);
38 void DeRegisterMessageServer(MessageServerInfo m); 39 void DeRegisterMessageServer(MessageServerInfo m);
39 } 40 }*/
40} 41}
diff --git a/OpenSim/Grid/GridServer/IUGAIMCore.cs b/OpenSim/Grid/GridServer/IUGAIMCore.cs
index 561c230..6c53b59 100644
--- a/OpenSim/Grid/GridServer/IUGAIMCore.cs
+++ b/OpenSim/Grid/GridServer/IUGAIMCore.cs
@@ -30,11 +30,12 @@ using OpenSim.Framework.Servers;
30 30
31namespace OpenSim.Grid.GridServer 31namespace OpenSim.Grid.GridServer
32{ 32{
33 /*
33 public interface IUGAIMCore 34 public interface IUGAIMCore
34 { 35 {
35 T Get<T>(); 36 T Get<T>();
36 void RegisterInterface<T>(T iface); 37 void RegisterInterface<T>(T iface);
37 bool TryGet<T>(out T iface); 38 bool TryGet<T>(out T iface);
38 BaseHttpServer GetHttpServer(); 39 BaseHttpServer GetHttpServer();
39 } 40 }*/
40} 41}