Merge branch 'grid-service-redux'

author: Melanie 2009-09-28 23:03:47 +0100
committer: Melanie 2009-09-28 23:03:47 +0100
commit: 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch)
tree: 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
parent: Allow the notation config_name@port/dll_name:class_name as a handler spec (diff)
parent: Forgot a return statement. (diff)
download: opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip
opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz
opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2
opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
index 36915ef..0974372 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
        private void RunHGCommand(string command, string[] cmdparams)
        {
-            if (command.Equals("linkk-mapping"))
+            if (command.Equals("link-mapping"))
            {
                if (cmdparams.Length == 2)
                {
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                    }
                }
            }
-            else if (command.Equals("linkk-region"))
+            else if (command.Equals("link-region"))
            {
                if (cmdparams.Length < 3)
                {
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                }
                return;
            }
-            else if (command.Equals("unlinkk-region"))
+            else if (command.Equals("unlink-region"))
            {
                if (cmdparams.Length < 1)
                {
author	Melanie	2009-09-28 23:03:47 +0100
committer	Melanie	2009-09-28 23:03:47 +0100
commit	07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch)
tree	1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
parent	Allow the notation config_name@port/dll_name:class_name as a handler spec (diff)
parent	Forgot a return statement. (diff)
download	opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC_OLD-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs index 36915ef..0974372 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
86		86
87	private void RunHGCommand(string command, string[] cmdparams)	87	private void RunHGCommand(string command, string[] cmdparams)
88	{	88	{
89	if (command.Equals("linkk-mapping"))	89	if (command.Equals("link-mapping"))
90	{	90	{
91	if (cmdparams.Length == 2)	91	if (cmdparams.Length == 2)
92	{	92	{
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
104	}	104	}
105	}	105	}
106	}	106	}
107	else if (command.Equals("linkk-region"))	107	else if (command.Equals("link-region"))
108	{	108	{
109	if (cmdparams.Length < 3)	109	if (cmdparams.Length < 3)
110	{	110	{
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
187	}	187	}
188	return;	188	return;
189	}	189	}
190	else if (command.Equals("unlinkk-region"))	190	else if (command.Equals("unlink-region"))
191	{	191	{
192	if (cmdparams.Length < 1)	192	if (cmdparams.Length < 1)
193	{	193	{