* 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.

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 @@
         <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" />
         <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
         <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
+        <RegionModule id="LocalPresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.LocalPresenceServicesConnector" />
+        <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
         <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" />
       <!-- Service connectors IN modules -->
         <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;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 {
-    public class LocalPresenceServiceConnector : ISharedRegionModule, IPresenceService
+    public class LocalPresenceServicesConnector : ISharedRegionModule, IPresenceService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 
         public string Name
         {
-            get { return "LocalPresenceServiceConnector"; }
+            get { return "LocalPresenceServicesConnector"; }
         }
 
         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;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 {
-    public class RemotePresenceServiceConnector : ISharedRegionModule, IPresenceService
+    public class RemotePresenceServicesConnector : ISharedRegionModule, IPresenceService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
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 @@
     NeighbourServices = "LocalNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "LocalGridServicesConnector"
+    PresenceServices ="LocalPresenceServicesConnector"
     LibraryModule = true
 
 [AssetService]
@@ -28,3 +29,5 @@
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
 
+[PresenceService]
+    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 @@
     NeighbourServices = "RemoteNeighbourServicesConnector"
     AuthorizationServices = "LocalAuthorizationServicesConnector"
     GridServices = "HGGridServicesConnector"
+    PresenceServices ="LocalPresenceServicesConnector"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -52,3 +53,6 @@
         ; LocalGridServicesConnector needs this
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
         Realm = "regions"
+
+[PresenceService]
+    LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"