aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r--OpenSim/Services/GridService/GridService.cs30
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs26
2 files changed, 30 insertions, 26 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 4dee7a4..1368e46 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -82,20 +82,22 @@ namespace OpenSim.Services.GridService
82 { 82 {
83 m_RootInstance = this; 83 m_RootInstance = this;
84 84
85 MainConsole.Instance.Commands.AddCommand("grid", true, 85 if (MainConsole.Instance != null)
86 "show region", 86 {
87 "show region <Region name>", 87 MainConsole.Instance.Commands.AddCommand("grid", true,
88 "Show details on a region", 88 "show region",
89 String.Empty, 89 "show region <Region name>",
90 HandleShowRegion); 90 "Show details on a region",
91 91 String.Empty,
92 MainConsole.Instance.Commands.AddCommand("grid", true, 92 HandleShowRegion);
93 "set region flags", 93
94 "set region flags <Region name> <flags>", 94 MainConsole.Instance.Commands.AddCommand("grid", true,
95 "Set database flags for region", 95 "set region flags",
96 String.Empty, 96 "set region flags <Region name> <flags>",
97 HandleSetFlags); 97 "Set database flags for region",
98 98 String.Empty,
99 HandleSetFlags);
100 }
99 m_HypergridLinker = new HypergridLinker(m_config, this, m_Database); 101 m_HypergridLinker = new HypergridLinker(m_config, this, m_Database);
100 } 102 }
101 } 103 }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 18d0586..de5df9d 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -113,18 +113,20 @@ namespace OpenSim.Services.GridService
113 113
114 m_log.DebugFormat("[HYPERGRID LINKER]: Loaded all services..."); 114 m_log.DebugFormat("[HYPERGRID LINKER]: Loaded all services...");
115 } 115 }
116 116
117 117 if (MainConsole.Instance != null)
118 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", 118 {
119 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", 119 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
120 "Link a hypergrid region", RunCommand); 120 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
121 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", 121 "Link a hypergrid region", RunCommand);
122 "unlink-region <local name> or <HostName>:<HttpPort> <cr>", 122 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region",
123 "Unlink a hypergrid region", RunCommand); 123 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
124 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>", 124 "Unlink a hypergrid region", RunCommand);
125 "Set local coordinate to map HG regions to", RunCommand); 125 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
126 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>", 126 "Set local coordinate to map HG regions to", RunCommand);
127 "List the HG regions", HandleShow); 127 MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>",
128 "List the HG regions", HandleShow);
129 }
128 } 130 }
129 131
130 132