diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index f9e61aa972..8f8271845d 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -38,11 +38,15 @@
+
+
+
\
+ \
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
index 8d113d38d0..4fbee7f4c8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
m_Enabled = moduleConfig.GetBoolean("HypergridServiceInConnector", false);
if (m_Enabled)
{
- m_log.Info("[INVENTORY IN CONNECTOR]: Hypergrid Service In Connector enabled");
+ m_log.Info("[HGGRID IN CONNECTOR]: Hypergrid Service In Connector enabled");
}
}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
index eee3a6ccdf..2a862d4fbe 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private void RunHGCommand(string command, string[] cmdparams)
{
- if (command.Equals("link-mapping"))
+ if (command.Equals("linkk-mapping"))
{
if (cmdparams.Length == 2)
{
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
}
}
}
- else if (command.Equals("link-region"))
+ else if (command.Equals("linkk-region"))
{
if (cmdparams.Length < 3)
{
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
}
return;
}
- else if (command.Equals("unlink-region"))
+ else if (command.Equals("unlinkk-region"))
{
if (cmdparams.Length < 1)
{
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 7aeb761db3..c6ade15779 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -156,18 +156,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
if (!m_Initialized)
{
m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService);
+ HGCommands hgCommands = new HGCommands(this, scene);
+ MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-region",
+ "link-region :[:] ",
+ "Link a hypergrid region", hgCommands.RunCommand);
+ MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlinkk-region",
+ "unlink-region or : ",
+ "Unlink a hypergrid region", hgCommands.RunCommand);
+ MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-mapping", "link-mapping [ ] ",
+ "Set local coordinate to map HG regions to", hgCommands.RunCommand);
m_Initialized = true;
}
- HGCommands hgCommands = new HGCommands(this, scene);
- scene.AddCommand("HG", "link-region",
- "link-region :[:] ",
- "Link a hypergrid region", hgCommands.RunCommand);
- scene.AddCommand("HG", "unlink-region",
- "unlink-region or : ",
- "Unlink a hypergrid region", hgCommands.RunCommand);
- scene.AddCommand("HG", "link-mapping", "link-mapping [ ] ",
- "Set local coordinate to map HG regions to", hgCommands.RunCommand);
+
+ //scene.AddCommand("HGGridServicesConnector", "linkk-region",
+ // "link-region :[:] ",
+ // "Link a hypergrid region", hgCommands.RunCommand);
+ //scene.AddCommand("HGGridServicesConnector", "unlinkk-region",
+ // "unlink-region or : ",
+ // "Unlink a hypergrid region", hgCommands.RunCommand);
+ //scene.AddCommand("HGGridServicesConnector", "linkk-mapping", "link-mapping [ ] ",
+ // "Set local coordinate to map HG regions to", hgCommands.RunCommand);
}
@@ -407,6 +416,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return null;
}
+ // From the map search and secondlife://blah
public SimpleRegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
{
uint xloc = (uint)(random.Next(0, Int16.MaxValue));
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 3f294013d4..c1b7235eae 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -50,6 +50,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private bool m_Enabled = false;
+ public LocalGridServicesConnector()
+ {
+ }
+
public LocalGridServicesConnector(IConfigSource source)
{
InitialiseService(source);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 8526653031..4303fa85ff 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -51,6 +51,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private IGridService m_LocalGridService;
+ public RemoteGridServicesConnector()
+ {
+ }
+
public RemoteGridServicesConnector(IConfigSource source)
{
InitialiseServices(source);
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b63ff..69c60ee342 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
InventoryServices = "LocalInventoryServicesConnector"
NeighbourServices = "LocalNeighbourServicesConnector"
AuthorizationServices = "LocalAuthorizationServicesConnector"
+ GridServices = "LocalGridServicesConnector"
[AssetService]
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,7 @@
[AuthorizationService]
LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
+
+[GridService]
+ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index aa122be34e..24b0f2664c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,9 +12,11 @@
InventoryServices = "HGInventoryBroker"
NeighbourServices = "LocalNeighbourServicesConnector"
AuthorizationServices = "LocalAuthorizationServicesConnector"
+ GridServices = "HGGridServicesConnector"
InventoryServiceInConnector = true
AssetServiceInConnector = true
HGAuthServiceInConnector = true
+ HypergridServiceInConnector = true
[AssetService]
; For the AssetServiceInConnector
@@ -39,4 +41,7 @@
; For the HGAuthServiceInConnector
LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
-
\ No newline at end of file
+[GridService]
+ LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+ GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServiceConnector"
+ StorageProvider = "OpenSim.Data.Null.dll"
\ No newline at end of file