aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-15 17:45:48 +0000
committerJustin Clarke Casey2008-09-15 17:45:48 +0000
commit9170361bee439ccd7f25030fcfb14701a4e8add0 (patch)
tree65abfc214b267b665daf3e419f26bb23a58f3e60
parent* Add "reset user password" command to standalone region console (diff)
downloadopensim-SC_OLD-9170361bee439ccd7f25030fcfb14701a4e8add0.zip
opensim-SC_OLD-9170361bee439ccd7f25030fcfb14701a4e8add0.tar.gz
opensim-SC_OLD-9170361bee439ccd7f25030fcfb14701a4e8add0.tar.bz2
opensim-SC_OLD-9170361bee439ccd7f25030fcfb14701a4e8add0.tar.xz
* Complete refactoring accidentally left unfinished so that all server help requests flow through the ShowHelp() method
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs16
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs10
-rw-r--r--OpenSim/Grid/UserServer/Main.cs15
-rw-r--r--OpenSim/Region/Application/OpenSim.cs45
4 files changed, 17 insertions, 69 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index e149a35..2018d55 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -229,22 +229,8 @@ namespace OpenSim.Framework.Servers
229 switch (command) 229 switch (command)
230 { 230 {
231 case "help": 231 case "help":
232 ShowHelp(cmdparams);
232 Notice(""); 233 Notice("");
233 // TODO: help on commands not yet implemented
234 //Notice("help [command] - display general help or specific command help.");
235 Notice("quit - equivalent to shutdown.");
236
237 Notice("set log level [level] - change the console logging level only. For example, off or debug.");
238 Notice("show info - show server information (e.g. startup path).");
239
240 if (m_stats != null)
241 Notice("show stats - show statistical information for this server");
242
243 Notice("show threads - list tracked threads");
244 Notice("show uptime - show server startup time and uptime.");
245 Notice("show version - show server version.");
246 Notice("shutdown - shutdown the server.\n");
247
248 break; 234 break;
249 235
250 case "set": 236 case "set":
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c73facb..c64c74e 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -150,15 +150,19 @@ namespace OpenSim.Grid.MessagingServer
150 150
151 switch (cmd) 151 switch (cmd)
152 { 152 {
153 case "help":
154 m_console.Notice("clear-cache - Clears region cache. Should be done when regions change position. The region cache gets stale after a while.");
155 break;
156 case "clear-cache": 153 case "clear-cache":
157 int entries = msgsvc.ClearRegionCache(); 154 int entries = msgsvc.ClearRegionCache();
158 m_console.Notice("Region cache cleared! Cleared " + entries.ToString() + " entries"); 155 m_console.Notice("Region cache cleared! Cleared " + entries.ToString() + " entries");
159 break; 156 break;
160 } 157 }
161 } 158 }
159
160 protected override void ShowHelp(string[] helpArgs)
161 {
162 base.ShowHelp(helpArgs);
163
164 m_console.Notice("clear-cache - Clears region cache. Should be done when regions change position. The region cache gets stale after a while.");
165 }
162 166
163 public override void Shutdown() 167 public override void Shutdown()
164 { 168 {
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 94e0728..0a64925 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -227,12 +227,6 @@ namespace OpenSim.Grid.UserServer
227 227
228 switch (cmd) 228 switch (cmd)
229 { 229 {
230 case "help":
231 m_console.Notice("create user - create a new user");
232 m_console.Notice(
233 "logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid");
234 break;
235
236 case "create": 230 case "create":
237 do_create(cmdparams[0]); 231 do_create(cmdparams[0]);
238 break; 232 break;
@@ -309,6 +303,15 @@ namespace OpenSim.Grid.UserServer
309 break; 303 break;
310 } 304 }
311 } 305 }
306
307 protected override void ShowHelp(string[] helpArgs)
308 {
309 base.ShowHelp(helpArgs);
310
311 m_console.Notice("create user - create a new user");
312 m_console.Notice(
313 "logoff-user <firstname> <lastname> <message> - logs off the specified user from the grid");
314 }
312 315
313 public override void Shutdown() 316 public override void Shutdown()
314 { 317 {
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 12ef129..e48df81 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -243,51 +243,6 @@ namespace OpenSim
243 Debug(cmdparams); 243 Debug(cmdparams);
244 break; 244 break;
245 245
246 case "help":
247 m_console.Notice("alert - send alert to a designated user or all users.");
248 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
249 m_console.Notice(" alert general [Message] - send an alert to all users.");
250 m_console.Notice("backup - persist simulator objects to the database ahead of the normal schedule.");
251 m_console.Notice("clear-assets - clear the asset cache");
252 m_console.Notice("create-region <name> <regionfile.xml> - create a new region");
253 m_console.Notice("change-region <name> - select the region that single region commands operate upon.");
254 m_console.Notice("command-script [filename] - Execute command in a file.");
255 m_console.Notice("debug - debugging commands");
256 m_console.Notice(" debug packet 0..255 - print incoming/outgoing packets (0=off)");
257 m_console.Notice(" debug scene [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False");
258 m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim");
259 m_console.Notice("export-map [filename] - save image of world map");
260 m_console.Notice("force-update - force an update of prims in the scene");
261 m_console.Notice("restart - disconnects all clients and restarts the sims in the instance.");
262 m_console.Notice("remove-region [name] - remove a region");
263 m_console.Notice("load-xml [filename] - load prims from XML (DEPRECATED)");
264 m_console.Notice("save-xml [filename] - save prims to XML (DEPRECATED)");
265 m_console.Notice("save-xml2 [filename] - save prims to XML using version 2 format");
266 m_console.Notice("load-xml2 [filename] - load prims from XML using version 2 format");
267 m_console.Notice("load-oar [filename] - load an OpenSimulator region archive. This replaces everything in the current region.");
268 m_console.Notice("save-oar [filename] - Save the current region to an OpenSimulator region archive.");
269 m_console.Notice("script - manually trigger scripts? or script commands?");
270 m_console.Notice("set-time [x] - set the current scene time phase");
271 m_console.Notice("show assets - show state of asset cache.");
272 m_console.Notice("show users - show info about connected users (only root agents).");
273 m_console.Notice("show users full - show info about connected users (root and child agents).");
274 m_console.Notice("show modules - shows info about loaded modules.");
275 m_console.Notice("show regions - show running region information.");
276 m_console.Notice("config set section field value - set a config value");
277 m_console.Notice("config get section field - get a config value");
278 m_console.Notice("config save - save OpenSim.ini");
279 m_console.Notice("terrain help - show help for terrain commands.");
280 ShowPluginCommandsHelp(CombineParams(cmdparams, 0), m_console);
281
282 if (m_sandbox)
283 {
284 m_console.Notice("");
285 m_console.Notice("create user - adds a new user.");
286 m_console.Notice("reset user password - reset a user's password.");
287 }
288
289 break;
290
291 case "save-xml": 246 case "save-xml":
292 SaveXml(cmdparams); 247 SaveXml(cmdparams);
293 break; 248 break;