1 files changed, 4 insertions, 25 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 5b2d7dc..6346279 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -38,6 +38,8 @@ using log4net;
 using log4net.Appender;
 using log4net.Core;
 using log4net.Repository;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Monitoring;
@@ -45,16 +47,12 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using Timer=System.Timers.Timer;
 
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
-
 namespace OpenSim.Framework.Servers
 {
     /// <summary>
     /// Common base for the main OpenSimServers (user, grid, inventory, region, etc)
     /// </summary>
-    public abstract class BaseOpenSimServer
+    public abstract class BaseOpenSimServer : ServerBase
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -69,11 +67,6 @@ namespace OpenSim.Framework.Servers
         protected IAppender m_logFileAppender = null; 
 
         /// <summary>
-        /// Time at which this server was started
-        /// </summary>
-        protected DateTime m_startuptime;
-
-        /// <summary>
         /// Record the initial startup directory for info purposes
         /// </summary>
         protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -96,9 +89,8 @@ namespace OpenSim.Framework.Servers
             get { return m_httpServer; }
         }
 
-        public BaseOpenSimServer()
+        public BaseOpenSimServer() : base()
         {
-            m_startuptime = DateTime.Now;
             m_version = VersionInfo.Version;
             
             // Random uuid for private data
@@ -284,19 +276,6 @@ namespace OpenSim.Framework.Servers
         }
 
         /// <summary>
-        /// Return a report about the uptime of this server
-        /// </summary>
-        /// <returns></returns>
-        protected string GetUptimeReport()
-        {
-            StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
-            sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
-            sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
-
-            return sb.ToString();
-        }
-
-        /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
         public virtual void Startup()