diff options
author | Justin Clarke Casey | 2008-08-18 21:14:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-08-18 21:14:38 +0000 |
commit | 9650632cd125fa6e5c804f76ecdfac9904e8581b (patch) | |
tree | b8ad66f6a436ef2e755d5d29448f31ce5c748b69 /OpenSim/Region/Application | |
parent | * osmantis test. Speak, we want you to. (diff) | |
download | opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.zip opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.tar.gz opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.tar.bz2 opensim-SC_OLD-9650632cd125fa6e5c804f76ecdfac9904e8581b.tar.xz |
* It appears that sometimes some IClientAPI reference is not being released, resulting in continual execution of the CheckConnectivity timer method
* For now, just turn off this timer when we close the connection
* Also some minor help refactoring creeps in to this revision.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 47 |
1 files changed, 47 insertions, 0 deletions
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) |