aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-12-28 09:22:35 -0800
committerDiva Canto2009-12-28 09:22:35 -0800
commitf43a64805251dfbb2e24abc481b8b59c062d452e (patch)
tree6330a5bf7250e143a6e3ce54851b57d4a63a2e87
parent* Deleted HGPresenceBroker, since it won't be needed (diff)
downloadopensim-SC_OLD-f43a64805251dfbb2e24abc481b8b59c062d452e.zip
opensim-SC_OLD-f43a64805251dfbb2e24abc481b8b59c062d452e.tar.gz
opensim-SC_OLD-f43a64805251dfbb2e24abc481b8b59c062d452e.tar.bz2
opensim-SC_OLD-f43a64805251dfbb2e24abc481b8b59c062d452e.tar.xz
* Added the new modules to Resources, making them active.
* Added their configs to standalone for testing. This crashes, because the DB is still not ready.
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs2
-rw-r--r--bin/config-include/Standalone.ini3
-rw-r--r--bin/config-include/StandaloneHypergrid.ini4
5 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 40a13f4..79796b1 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -48,6 +48,8 @@
48 <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" /> 48 <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" />
49 <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" /> 49 <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
50 <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" /> 50 <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
51 <RegionModule id="LocalPresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.LocalPresenceServicesConnector" />
52 <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
51 <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" /> 53 <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" />
52 <!-- Service connectors IN modules --> 54 <!-- Service connectors IN modules -->
53 <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" /> 55 <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
index 510e9cb..8aad7e0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
@@ -40,7 +40,7 @@ using Nini.Config;
40 40
41namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence 41namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
42{ 42{
43 public class LocalPresenceServiceConnector : ISharedRegionModule, IPresenceService 43 public class LocalPresenceServicesConnector : ISharedRegionModule, IPresenceService
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
58 58
59 public string Name 59 public string Name
60 { 60 {
61 get { return "LocalPresenceServiceConnector"; } 61 get { return "LocalPresenceServicesConnector"; }
62 } 62 }
63 63
64 public void Initialise(IConfigSource source) 64 public void Initialise(IConfigSource source)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
index d75ed51..6a674ce 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
@@ -41,7 +41,7 @@ using Nini.Config;
41 41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
43{ 43{
44 public class RemotePresenceServiceConnector : ISharedRegionModule, IPresenceService 44 public class RemotePresenceServicesConnector : ISharedRegionModule, IPresenceService
45 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index cdfdf4b..c4cffb9 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -13,6 +13,7 @@
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 14 AuthorizationServices = "LocalAuthorizationServicesConnector"
15 GridServices = "LocalGridServicesConnector" 15 GridServices = "LocalGridServicesConnector"
16 PresenceServices ="LocalPresenceServicesConnector"
16 LibraryModule = true 17 LibraryModule = true
17 18
18[AssetService] 19[AssetService]
@@ -28,3 +29,5 @@
28 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 29 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
29 Realm = "regions" 30 Realm = "regions"
30 31
32[PresenceService]
33 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 909286c..bd9de33 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -16,6 +16,7 @@
16 NeighbourServices = "RemoteNeighbourServicesConnector" 16 NeighbourServices = "RemoteNeighbourServicesConnector"
17 AuthorizationServices = "LocalAuthorizationServicesConnector" 17 AuthorizationServices = "LocalAuthorizationServicesConnector"
18 GridServices = "HGGridServicesConnector" 18 GridServices = "HGGridServicesConnector"
19 PresenceServices ="LocalPresenceServicesConnector"
19 InventoryServiceInConnector = true 20 InventoryServiceInConnector = true
20 AssetServiceInConnector = true 21 AssetServiceInConnector = true
21 HGAuthServiceInConnector = true 22 HGAuthServiceInConnector = true
@@ -52,3 +53,6 @@
52 ; LocalGridServicesConnector needs this 53 ; LocalGridServicesConnector needs this
53 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
54 Realm = "regions" 55 Realm = "regions"
56
57[PresenceService]
58 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"