From 35deff7ec4df6156abccdbeed83b14a6083e28f9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Sep 2009 09:27:01 -0700
Subject: Modules active. Tested HGGridConnector in standalone only for now.
Modules commands work.
---
.../Resources/CoreModulePlugin.addin.xml | 4 ++++
.../Grid/HypergridServiceInConnectorModule.cs | 2 +-
.../ServiceConnectorsOut/Grid/HGCommands.cs | 6 ++---
.../ServiceConnectorsOut/Grid/HGGridConnector.cs | 28 +++++++++++++++-------
.../Grid/LocalGridServiceConnector.cs | 4 ++++
.../Grid/RemoteGridServiceConnector.cs | 4 ++++
6 files changed, 35 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index f9e61aa..8f82718 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 8d113d3..4fbee7f 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 eee3a6c..2a862d4 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 7aeb761..c6ade15 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 3f29401..c1b7235 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 8526653..4303fa8 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);
--
cgit v1.1