From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 5 Jan 2017 19:07:37 +0000
Subject: Massive tab and trailing space cleanup
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 30 +++++++++++++-------------
1 file changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 1d4deac..f761813 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -68,9 +68,9 @@ namespace OpenSim.Framework.Servers
private int m_periodDiagnosticTimerMS = 60 * 60 * 1000;
private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
-
+
///
- /// Random uuid for private data
+ /// Random uuid for private data
///
protected string m_osSecret = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Servers
// Random uuid for private data
m_osSecret = UUID.Random().ToString();
}
-
+
///
/// Must be overriden by child classes for their own server specific startup behaviour.
///
@@ -104,10 +104,10 @@ namespace OpenSim.Framework.Servers
m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS;
m_periodicDiagnosticsTimer.Enabled = true;
}
- }
+ }
protected override void ShutdownSpecific()
- {
+ {
m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
RemovePIDFile();
@@ -117,12 +117,12 @@ namespace OpenSim.Framework.Servers
if (!SuppressExit)
Environment.Exit(0);
}
-
+
///
/// Provides a list of help topics that are available. Overriding classes should append their topics to the
/// information returned when the base method is called.
///
- ///
+ ///
///
/// A list of strings that represent different help topics on which more information is available
///
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Servers
public virtual void Startup()
{
m_log.Info("[STARTUP]: Beginning startup processing");
-
+
m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine);
// clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
// the clr version number doesn't match the project version number under Mono.
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers
m_log.InfoFormat(
"[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
-
+
try
{
StartupSpecific();
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Servers
(e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
Environment.Exit(1);
}
-
+
TimeSpan timeTaken = DateTime.Now - m_startuptime;
-
+
// MainConsole.Instance.OutputFormat(
// "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.",
// timeTaken.Minutes, timeTaken.Seconds);
}
- public string osSecret
+ public string osSecret
{
// Secret uuid for the simulator
- get { return m_osSecret; }
+ get { return m_osSecret; }
}
public string StatReport(IOSHttpRequest httpRequest)
@@ -187,8 +187,8 @@ namespace OpenSim.Framework.Servers
if (httpRequest.Query.ContainsKey("callback"))
{
return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
- }
- else
+ }
+ else
{
return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
}
--
cgit v1.1