From 4b46a0d5368ae1ae95b5ba817f0ef4f7ed0c2692 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 04:19:08 +0000
Subject: Make "show version" console command available across all servers

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 8 --------
 OpenSim/Framework/Servers/ServerBase.cs        | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Framework')

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
                     "show threads",
                     "Show thread status", HandleShow);
 
-            m_console.Commands.AddCommand("General", false, "show version",
-                    "show version",
-                    "Show server version", HandleShow);
-
             m_console.Commands.AddCommand("General", false, "threads abort",
                     "threads abort <thread-id>",
                     "Abort a managed thread.  Use \"show threads\" to find possible threads.", HandleThreadsAbort);
@@ -263,10 +259,6 @@ namespace OpenSim.Framework.Servers
                 case "threads":
                     Notice(GetThreadsReport());
                     break;
-
-                case "version":
-                    Notice(GetVersionText());
-                    break;
             }
         }
 
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
                 "General", false, "show info", "show info", "Show general information about the server", HandleShow);
 
             m_console.Commands.AddCommand(
+                "General", false, "show version", "show version", "Show server version", HandleShow);
+
+            m_console.Commands.AddCommand(
                 "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow);
 
             m_console.Commands.AddCommand(
@@ -222,6 +225,10 @@ namespace OpenSim.Framework.Servers
                     ShowInfo();
                     break;
 
+                case "version":
+                    Notice(GetVersionText());
+                    break;
+
                 case "uptime":
                     Notice(GetUptimeReport());
                     break;
-- 
cgit v1.1