diff options
author | Justin Clark-Casey (justincc) | 2012-11-23 04:19:08 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-23 04:19:08 +0000 |
commit | 4b46a0d5368ae1ae95b5ba817f0ef4f7ed0c2692 (patch) | |
tree | a537b8297ca9426a2fe1fa4ba81a99212da037ea | |
parent | Delete unused BaseHttpServer.HandleAgentRequest() (diff) | |
download | opensim-SC_OLD-4b46a0d5368ae1ae95b5ba817f0ef4f7ed0c2692.zip opensim-SC_OLD-4b46a0d5368ae1ae95b5ba817f0ef4f7ed0c2692.tar.gz opensim-SC_OLD-4b46a0d5368ae1ae95b5ba817f0ef4f7ed0c2692.tar.bz2 opensim-SC_OLD-4b46a0d5368ae1ae95b5ba817f0ef4f7ed0c2692.tar.xz |
Make "show version" console command available across all servers
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 89d3507..d8b4737 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -104,10 +104,6 @@ namespace OpenSim.Framework.Servers | |||
104 | "show threads", | 104 | "show threads", |
105 | "Show thread status", HandleShow); | 105 | "Show thread status", HandleShow); |
106 | 106 | ||
107 | m_console.Commands.AddCommand("General", false, "show version", | ||
108 | "show version", | ||
109 | "Show server version", HandleShow); | ||
110 | |||
111 | m_console.Commands.AddCommand("General", false, "threads abort", | 107 | m_console.Commands.AddCommand("General", false, "threads abort", |
112 | "threads abort <thread-id>", | 108 | "threads abort <thread-id>", |
113 | "Abort a managed thread. Use \"show threads\" to find possible threads.", HandleThreadsAbort); | 109 | "Abort a managed thread. Use \"show threads\" to find possible threads.", HandleThreadsAbort); |
@@ -263,10 +259,6 @@ namespace OpenSim.Framework.Servers | |||
263 | case "threads": | 259 | case "threads": |
264 | Notice(GetThreadsReport()); | 260 | Notice(GetThreadsReport()); |
265 | break; | 261 | break; |
266 | |||
267 | case "version": | ||
268 | Notice(GetVersionText()); | ||
269 | break; | ||
270 | } | 262 | } |
271 | } | 263 | } |
272 | 264 | ||
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index c182a3a..431dc9e 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -168,6 +168,9 @@ namespace OpenSim.Framework.Servers | |||
168 | "General", false, "show info", "show info", "Show general information about the server", HandleShow); | 168 | "General", false, "show info", "show info", "Show general information about the server", HandleShow); |
169 | 169 | ||
170 | m_console.Commands.AddCommand( | 170 | m_console.Commands.AddCommand( |
171 | "General", false, "show version", "show version", "Show server version", HandleShow); | ||
172 | |||
173 | m_console.Commands.AddCommand( | ||
171 | "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow); | 174 | "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow); |
172 | 175 | ||
173 | m_console.Commands.AddCommand( | 176 | m_console.Commands.AddCommand( |
@@ -222,6 +225,10 @@ namespace OpenSim.Framework.Servers | |||
222 | ShowInfo(); | 225 | ShowInfo(); |
223 | break; | 226 | break; |
224 | 227 | ||
228 | case "version": | ||
229 | Notice(GetVersionText()); | ||
230 | break; | ||
231 | |||
225 | case "uptime": | 232 | case "uptime": |
226 | Notice(GetUptimeReport()); | 233 | Notice(GetUptimeReport()); |
227 | break; | 234 | break; |