aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs28
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs4
-rw-r--r--bin/config-include/Standalone.ini5
-rw-r--r--bin/config-include/StandaloneHypergrid.ini7
8 files changed, 46 insertions, 14 deletions
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 @@
38 <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" /> 38 <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
39 <RegionModule id="LocalInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.LocalInterregionComms" /> 39 <RegionModule id="LocalInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.LocalInterregionComms" />
40 <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" /> 40 <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" />
41 <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
42 <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
43 <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" />
41 <!-- Service connectors IN modules --> 44 <!-- Service connectors IN modules -->
42 <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" /> 45 <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
43 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" /> 46 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
44 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" /> 47 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
45 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \ 48 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
49 <RegionModule id="HypergridServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.HypergridServiceInConnectorModule" /> \
46 50
47 </Extension> 51 </Extension>
48 52
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
64 m_Enabled = moduleConfig.GetBoolean("HypergridServiceInConnector", false); 64 m_Enabled = moduleConfig.GetBoolean("HypergridServiceInConnector", false);
65 if (m_Enabled) 65 if (m_Enabled)
66 { 66 {
67 m_log.Info("[INVENTORY IN CONNECTOR]: Hypergrid Service In Connector enabled"); 67 m_log.Info("[HGGRID IN CONNECTOR]: Hypergrid Service In Connector enabled");
68 } 68 }
69 69
70 } 70 }
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
85 85
86 private void RunHGCommand(string command, string[] cmdparams) 86 private void RunHGCommand(string command, string[] cmdparams)
87 { 87 {
88 if (command.Equals("link-mapping")) 88 if (command.Equals("linkk-mapping"))
89 { 89 {
90 if (cmdparams.Length == 2) 90 if (cmdparams.Length == 2)
91 { 91 {
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
103 } 103 }
104 } 104 }
105 } 105 }
106 else if (command.Equals("link-region")) 106 else if (command.Equals("linkk-region"))
107 { 107 {
108 if (cmdparams.Length < 3) 108 if (cmdparams.Length < 3)
109 { 109 {
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
181 } 181 }
182 return; 182 return;
183 } 183 }
184 else if (command.Equals("unlink-region")) 184 else if (command.Equals("unlinkk-region"))
185 { 185 {
186 if (cmdparams.Length < 1) 186 if (cmdparams.Length < 1)
187 { 187 {
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
156 if (!m_Initialized) 156 if (!m_Initialized)
157 { 157 {
158 m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); 158 m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService);
159 HGCommands hgCommands = new HGCommands(this, scene);
160 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-region",
161 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
162 "Link a hypergrid region", hgCommands.RunCommand);
163 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlinkk-region",
164 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
165 "Unlink a hypergrid region", hgCommands.RunCommand);
166 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-mapping", "link-mapping [<x> <y>] <cr>",
167 "Set local coordinate to map HG regions to", hgCommands.RunCommand);
159 m_Initialized = true; 168 m_Initialized = true;
160 } 169 }
161 170
162 HGCommands hgCommands = new HGCommands(this, scene); 171
163 scene.AddCommand("HG", "link-region", 172 //scene.AddCommand("HGGridServicesConnector", "linkk-region",
164 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", 173 // "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
165 "Link a hypergrid region", hgCommands.RunCommand); 174 // "Link a hypergrid region", hgCommands.RunCommand);
166 scene.AddCommand("HG", "unlink-region", 175 //scene.AddCommand("HGGridServicesConnector", "unlinkk-region",
167 "unlink-region <local name> or <HostName>:<HttpPort> <cr>", 176 // "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
168 "Unlink a hypergrid region", hgCommands.RunCommand); 177 // "Unlink a hypergrid region", hgCommands.RunCommand);
169 scene.AddCommand("HG", "link-mapping", "link-mapping [<x> <y>] <cr>", 178 //scene.AddCommand("HGGridServicesConnector", "linkk-mapping", "link-mapping [<x> <y>] <cr>",
170 "Set local coordinate to map HG regions to", hgCommands.RunCommand); 179 // "Set local coordinate to map HG regions to", hgCommands.RunCommand);
171 180
172 } 181 }
173 182
@@ -407,6 +416,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
407 return null; 416 return null;
408 } 417 }
409 418
419 // From the map search and secondlife://blah
410 public SimpleRegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName) 420 public SimpleRegionInfo TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
411 { 421 {
412 uint xloc = (uint)(random.Next(0, Int16.MaxValue)); 422 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
50 50
51 private bool m_Enabled = false; 51 private bool m_Enabled = false;
52 52
53 public LocalGridServicesConnector()
54 {
55 }
56
53 public LocalGridServicesConnector(IConfigSource source) 57 public LocalGridServicesConnector(IConfigSource source)
54 { 58 {
55 InitialiseService(source); 59 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
51 51
52 private IGridService m_LocalGridService; 52 private IGridService m_LocalGridService;
53 53
54 public RemoteGridServicesConnector()
55 {
56 }
57
54 public RemoteGridServicesConnector(IConfigSource source) 58 public RemoteGridServicesConnector(IConfigSource source)
55 { 59 {
56 InitialiseServices(source); 60 InitialiseServices(source);
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b6..69c60ee 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
12 InventoryServices = "LocalInventoryServicesConnector" 12 InventoryServices = "LocalInventoryServicesConnector"
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 14 AuthorizationServices = "LocalAuthorizationServicesConnector"
15 GridServices = "LocalGridServicesConnector"
15 16
16[AssetService] 17[AssetService]
17 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 18 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,7 @@
21 22
22[AuthorizationService] 23[AuthorizationService]
23 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 24 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
25
26[GridService]
27 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
28 \ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index aa122be..24b0f26 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,9 +12,11 @@
12 InventoryServices = "HGInventoryBroker" 12 InventoryServices = "HGInventoryBroker"
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 14 AuthorizationServices = "LocalAuthorizationServicesConnector"
15 GridServices = "HGGridServicesConnector"
15 InventoryServiceInConnector = true 16 InventoryServiceInConnector = true
16 AssetServiceInConnector = true 17 AssetServiceInConnector = true
17 HGAuthServiceInConnector = true 18 HGAuthServiceInConnector = true
19 HypergridServiceInConnector = true
18 20
19[AssetService] 21[AssetService]
20 ; For the AssetServiceInConnector 22 ; For the AssetServiceInConnector
@@ -39,4 +41,7 @@
39 ; For the HGAuthServiceInConnector 41 ; For the HGAuthServiceInConnector
40 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" 42 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
41 43
42 \ No newline at end of file 44[GridService]
45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
46 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServiceConnector"
47 StorageProvider = "OpenSim.Data.Null.dll" \ No newline at end of file