aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs30
-rw-r--r--OpenSim/Region/Application/OpenSim.cs47
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
4 files changed, 87 insertions, 5 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 89fd77d..b9610e0 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -245,6 +245,7 @@ namespace OpenSim.Framework.Console
245 try 245 try
246 { 246 {
247 string line = System.Console.ReadLine(); 247 string line = System.Console.ReadLine();
248
248 while (line == null) 249 while (line == null)
249 { 250 {
250 line = System.Console.ReadLine(); 251 line = System.Console.ReadLine();
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 33081b9..abc2bc1 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -201,6 +201,8 @@ namespace OpenSim.Framework.Servers
201 { 201 {
202 case "help": 202 case "help":
203 Notice(""); 203 Notice("");
204 // TODO: help on commands not yet implemented
205 //Notice("help [command] - display general help or specific command help.");
204 Notice("quit - equivalent to shutdown."); 206 Notice("quit - equivalent to shutdown.");
205 207
206 Notice("set log level [level] - change the console logging level only. For example, off or debug."); 208 Notice("set log level [level] - change the console logging level only. For example, off or debug.");
@@ -253,6 +255,34 @@ namespace OpenSim.Framework.Servers
253 255
254 SetConsoleLogLevel(setParams); 256 SetConsoleLogLevel(setParams);
255 } 257 }
258 }
259
260 /// <summary>
261 /// Show help information
262 /// </summary>
263 /// <param name="helpArgs"></param>
264 public virtual void ShowHelp(string[] helpArgs)
265 {
266 if (helpArgs.Length == 0)
267 {
268 Notice("");
269 // TODO: not yet implemented
270 //Notice("help [command] - display general help or specific command help. Try help help for more info.");
271 Notice("quit - equivalent to shutdown.");
272
273 Notice("set log level [level] - change the console logging level only. For example, off or debug.");
274 Notice("show info - show server information (e.g. startup path).");
275
276 if (m_stats != null)
277 Notice("show stats - show statistical information for this server");
278
279 Notice("show threads - list tracked threads");
280 Notice("show uptime - show server startup time and uptime.");
281 Notice("show version - show server version.");
282 Notice("shutdown - shutdown the server.\n");
283
284 return;
285 }
256 } 286 }
257 287
258 /// <summary> 288 /// <summary>
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index cc2d993..2061ab9 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -56,6 +56,7 @@ namespace OpenSim
56 56
57 private string m_timedScript = "disabled"; 57 private string m_timedScript = "disabled";
58 private Timer m_scriptTimer; 58 private Timer m_scriptTimer;
59
59 /// <summary> 60 /// <summary>
60 /// List of Console Plugin Commands 61 /// List of Console Plugin Commands
61 /// </summary> 62 /// </summary>
@@ -600,6 +601,52 @@ namespace OpenSim
600 break; 601 break;
601 } 602 }
602 } 603 }
604
605 public override void ShowHelp(string[] helpArgs)
606 {
607 base.ShowHelp(helpArgs);
608
609 m_console.Notice("alert - send alert to a designated user or all users.");
610 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
611 m_console.Notice(" alert general [Message] - send an alert to all users.");
612 m_console.Notice("backup - persist simulator objects to the database ahead of the normal schedule.");
613 m_console.Notice("clear-assets - clear the asset cache");
614 m_console.Notice("create-region <name> <regionfile.xml> - create a new region");
615 m_console.Notice("change-region <name> - select the region that single region commands operate upon.");
616 m_console.Notice("command-script [filename] - Execute command in a file.");
617 m_console.Notice("debug - debugging commands");
618 m_console.Notice(" debug packet 0..255 - print incoming/outgoing packets (0=off)");
619 m_console.Notice(" debug scene [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False");
620 m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim");
621 m_console.Notice("export-map [filename] - save image of world map");
622 m_console.Notice("force-update - force an update of prims in the scene");
623 m_console.Notice("restart - disconnects all clients and restarts the sims in the instance.");
624 m_console.Notice("remove-region [name] - remove a region");
625 m_console.Notice("load-xml [filename] - load prims from XML (DEPRECATED)");
626 m_console.Notice("save-xml [filename] - save prims to XML (DEPRECATED)");
627 m_console.Notice("save-xml2 [filename] - save prims to XML using version 2 format");
628 m_console.Notice("load-xml2 [filename] - load prims from XML using version 2 format");
629 m_console.Notice("load-oar [filename] - load an OpenSimulator region archive. This replaces everything in the current region.");
630 m_console.Notice("save-oar [filename] - Save the current region to an OpenSimulator region archive.");
631 m_console.Notice("script - manually trigger scripts? or script commands?");
632 m_console.Notice("set-time [x] - set the current scene time phase");
633 m_console.Notice("show assets - show state of asset cache.");
634 m_console.Notice("show users - show info about connected users.");
635 m_console.Notice("show modules - shows info about loaded modules.");
636 m_console.Notice("show regions - show running region information.");
637 m_console.Notice("config set section field value - set a config value");
638 m_console.Notice("config get section field - get a config value");
639 m_console.Notice("config save - save OpenSim.ini");
640 m_console.Notice("terrain help - show help for terrain commands.");
641
642 ShowPluginCommandsHelp(CombineParams(helpArgs, 0), m_console);
643
644 if (m_sandbox)
645 {
646 m_console.Notice("");
647 m_console.Notice("create user - adds a new user.");
648 }
649 }
603 650
604 // see BaseOpenSimServer 651 // see BaseOpenSimServer
605 public override void Show(string ShowWhat) 652 public override void Show(string ShowWhat)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8f0e2d7..ef66e93 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -456,6 +456,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
456 /// <param name="shutdownCircuit"></param> 456 /// <param name="shutdownCircuit"></param>
457 public void Close(bool shutdownCircuit) 457 public void Close(bool shutdownCircuit)
458 { 458 {
459 m_clientPingTimer.Enabled = false;
460
459 m_log.DebugFormat( 461 m_log.DebugFormat(
460 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}", 462 "[CLIENT]: Close has been called with shutdownCircuit = {0} on scene {1}",
461 shutdownCircuit, m_scene.RegionInfo.RegionName); 463 shutdownCircuit, m_scene.RegionInfo.RegionName);
@@ -655,14 +657,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
655 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) 657 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked)
656 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) 658 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked))
657 { 659 {
660 m_clientPingTimer.Enabled = false;
661
662 m_log.WarnFormat(
663 "[CLIENT]: Client for agent {0} {1} has stopped responding to pings. Closing connection",
664 Name, AgentId);
665
658 if (OnConnectionClosed != null) 666 if (OnConnectionClosed != null)
659 { 667 {
660 m_log.WarnFormat(
661 "[CLIENT]: Client for agent {0} {1} has stopped responding to pings. Closing connection",
662 Name, AgentId);
663
664 OnConnectionClosed(this); 668 OnConnectionClosed(this);
665 } 669 }
666 } 670 }
667 else 671 else
668 { 672 {