Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527.

1 files changed, 16 insertions, 0 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a0b9568..d3941d6 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -291,6 +291,16 @@ namespace OpenSim
                                               "reset user password [<first> [<last> [<password>]]]",
                                               "Reset a user password", HandleResetUserPassword);
             }
+
+            m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
+                                          "Set local coordinate to map HG regions to", RunCommand);
+            m_console.Commands.AddCommand("hypergrid", false, "link-region",
+                                          "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
+                                          "Link a hypergrid region", RunCommand);
+            m_console.Commands.AddCommand("hypergrid", false, "unlink-region",
+                                          "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
+                                          "Unlink a hypergrid region", RunCommand);
+
         }
 
         public override void ShutdownSpecific()
@@ -625,6 +635,12 @@ namespace OpenSim
                         m_sceneManager.CacheJ2kDecode(1);
                     }
                     break;
+
+                case "link-region":
+                case "unlink-region":
+                case "link-mapping":
+                    HGCommands.RunHGCommand(command, cmdparams, m_sceneManager.CurrentOrFirstScene);
+                    break;
             }
         }