From 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 4 Jun 2008 09:59:27 +0000
Subject: Formatting cleanup, minor refactoring, svn properties.
---
OpenSim/Framework/ClientManager.cs | 1 +
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 30 +++++++++++++-------------
OpenSim/Framework/TaskInventoryItem.cs | 4 ++--
3 files changed, 18 insertions(+), 17 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index a70f7fa..b557ec1 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -137,6 +137,7 @@ namespace OpenSim.Framework
}
}
}
+
[Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")]
public uint[] GetAllCircuits(LLUUID agentId)
{
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 6753a21..0ee21ac 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -40,14 +40,14 @@ namespace OpenSim.Framework.Servers
public abstract class BaseOpenSimServer
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+
protected ConsoleBase m_console;
-
+
///
/// Time at which this server was started
///
protected DateTime m_startuptime;
-
+
///
/// Server version information. Usually VersionInfo + information about svn revision, operating system, etc.
///
@@ -66,19 +66,19 @@ namespace OpenSim.Framework.Servers
public BaseOpenSimServer()
{
- m_startuptime = DateTime.Now;
+ m_startuptime = DateTime.Now;
m_version = VersionInfo.Version;
}
-
+
///
/// Performs initialisation of the scene, such as loading configuration from disk.
///
public virtual void Startup()
- {
+ {
m_log.Info("[STARTUP]: Beginning startup processing");
-
+
EnhanceVersionInformation();
-
+
m_log.Info("[STARTUP]: Version " + m_version + "\n");
}
@@ -86,9 +86,9 @@ namespace OpenSim.Framework.Servers
/// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
///
public virtual void Shutdown()
- {
+ {
m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
-
+
Environment.Exit(0);
}
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers
Notice("show uptime - show server startup time and uptime.");
Notice("show version - show server version.");
Notice("shutdown - shutdown the server.\n");
-
+
break;
case "show":
@@ -146,10 +146,10 @@ namespace OpenSim.Framework.Servers
Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString());
Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString());
break;
-
+
case "version":
m_console.Notice("This is " + m_version);
- break;
+ break;
}
}
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Servers
protected void EnhanceVersionInformation()
{
string buildVersion = string.Empty;
-
+
// Add subversion revision information if available
// FIXME: Making an assumption about the directory we're currently in - we do this all over the place
// elsewhere as well
@@ -227,6 +227,6 @@ namespace OpenSim.Framework.Servers
}
m_version += ", OS " + OSString;
- }
+ }
}
}
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 4994fd4..1105242 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework
// see IXmlSerializable
public void ReadXml(XmlReader reader)
{
- // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name);
+ // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name);
if (!reader.IsEmptyElement)
{
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
// of the element wrapping this object so that the rest of the serialization can complete normally.
reader.Read();
- // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node after actions, {0}", reader.Name);
+ // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node after actions, {0}", reader.Name);
}
// see IXmlSerializable
--
cgit v1.1