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/Region/Application/Application.cs | 58 +++++++--------
OpenSim/Region/Application/ConfigurationLoader.cs | 14 ++--
OpenSim/Region/Application/IApplicationPlugin.cs | 2 +-
OpenSim/Region/Application/OpenSim.cs | 76 ++++++++++----------
OpenSim/Region/Application/OpenSimBase.cs | 84 +++++++++++-----------
.../Region/Application/Properties/AssemblyInfo.cs | 8 +--
.../Region/Application/RegionApplicationBase.cs | 12 ++--
7 files changed, 127 insertions(+), 127 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index e441cc8..5cb6a88 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -86,9 +86,9 @@ namespace OpenSim
if (logConfigFile != String.Empty)
{
XmlConfigurator.Configure(new System.IO.FileInfo(logConfigFile));
- m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file",
+ m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file",
logConfigFile);
- }
+ }
else
{
XmlConfigurator.Configure();
@@ -104,22 +104,22 @@ namespace OpenSim
"[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset");
// Verify the Threadpool allocates or uses enough worker and IO completion threads
- // .NET 2.0, workerthreads default to 50 * numcores
- // .NET 3.0, workerthreads defaults to 250 * numcores
- // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
+ // .NET 2.0, workerthreads default to 50 * numcores
+ // .NET 3.0, workerthreads defaults to 250 * numcores
+ // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
// Max IO Completion threads are 1000 on all 3 CLRs
//
// Mono 2.10.9 to at least Mono 3.1, workerthreads default to 100 * numcores, iocp threads to 4 * numcores
- int workerThreadsMin = 500;
- int workerThreadsMax = 1000; // may need further adjustment to match other CLR
- int iocpThreadsMin = 1000;
- int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
+ int workerThreadsMin = 500;
+ int workerThreadsMax = 1000; // may need further adjustment to match other CLR
+ int iocpThreadsMin = 1000;
+ int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
{
int currentMinWorkerThreads, currentMinIocpThreads;
System.Threading.ThreadPool.GetMinThreads(out currentMinWorkerThreads, out currentMinIocpThreads);
m_log.InfoFormat(
- "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads",
+ "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads",
currentMinWorkerThreads, currentMinIocpThreads);
}
@@ -138,30 +138,30 @@ namespace OpenSim
m_log.InfoFormat("[OPENSIM MAIN]: Limiting max worker threads to {0}",workerThreads);
}
- // Increase the number of IOCP threads available.
- // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
- if (iocpThreads < iocpThreadsMin)
+ // Increase the number of IOCP threads available.
+ // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
+ if (iocpThreads < iocpThreadsMin)
{
iocpThreads = iocpThreadsMin;
m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IOCP threads to {0}",iocpThreads);
}
- // Make sure we don't overallocate IOCP threads and thrash system resources
+ // Make sure we don't overallocate IOCP threads and thrash system resources
if ( iocpThreads > iocpThreadsMax )
{
iocpThreads = iocpThreadsMax;
m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IOCP completion threads to {0}",iocpThreads);
}
- // set the resulting worker and IO completion thread counts back to ThreadPool
+ // set the resulting worker and IO completion thread counts back to ThreadPool
if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) )
- {
- m_log.InfoFormat(
+ {
+ m_log.InfoFormat(
"[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads",
workerThreads, iocpThreads);
- }
- else
- {
- m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");
- }
+ }
+ else
+ {
+ m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");
+ }
// Check if the system is compatible with OpenSimulator.
// Ensures that the minimum system requirements are met
@@ -179,7 +179,7 @@ namespace OpenSim
Culture.SetCurrentCulture();
// Validate that the user has the most basic configuration done
- // If not, offer to do the most basic configuration for them warning them along the way of the importance of
+ // If not, offer to do the most basic configuration for them warning them along the way of the importance of
// reading these files.
/*
m_log.Info("Checking for reguired configuration...\n");
@@ -188,13 +188,13 @@ namespace OpenSim
|| (File.Exists(Path.Combine(Util.configDir(), "opensim.ini")))
|| (File.Exists(Path.Combine(Util.configDir(), "openSim.ini")))
|| (File.Exists(Path.Combine(Util.configDir(), "Opensim.ini")));
-
+
bool StanaloneCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini"));
bool StanaloneCommon_lowercased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "standalonecommon.ini"));
bool GridCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "GridCommon.ini"));
bool GridCommon_lowerCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "gridcommon.ini"));
- if ((OpenSim_Ini)
+ if ((OpenSim_Ini)
&& (
(StanaloneCommon_ProperCased
|| StanaloneCommon_lowercased
@@ -212,7 +212,7 @@ namespace OpenSim
"yes");
if (resp == "yes")
{
-
+
if (!(OpenSim_Ini))
{
try
@@ -312,7 +312,7 @@ namespace OpenSim
m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
// load Crash directory config
- m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
+ m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
if (background)
{
@@ -320,9 +320,9 @@ namespace OpenSim
m_sim.Startup();
}
else
- {
+ {
m_sim = new OpenSim(configSource);
-
+
m_sim.Startup();
while (true)
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 4f141a6..62bd4f4 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,10 +43,10 @@ namespace OpenSim
public class ConfigurationLoader
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+
///
/// Various Config settings the region needs to start
- /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
+ /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
/// StorageDLL, Storage Connection String, Estate connection String, Client Stack
/// Standalone settings.
///
@@ -188,7 +188,7 @@ namespace OpenSim
{
iniFileExists = true;
AddIncludes(overrideConfig, overrideSources);
- }
+ }
}
m_config.Source.Merge(overrideConfig.Source);
}
@@ -198,7 +198,7 @@ namespace OpenSim
{
m_log.FatalFormat("[CONFIG]: Could not load any configuration");
Environment.Exit(1);
- }
+ }
else if (!iniFileExists)
{
m_log.FatalFormat("[CONFIG]: Could not load any configuration");
@@ -257,14 +257,14 @@ namespace OpenSim
string path = Path.Combine(basepath, chunkWithoutWildcards);
path = Path.GetFullPath(path) + chunkWithWildcards;
string[] paths = Util.Glob(path);
-
+
// If the include path contains no wildcards, then warn the user that it wasn't found.
if (wildcardIndex == -1 && paths.Length == 0)
{
m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
}
else
- {
+ {
foreach (string p in paths)
{
if (!sources.Contains(p))
@@ -377,7 +377,7 @@ namespace OpenSim
m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
- m_configSettings.ClientstackDll
+ m_configSettings.ClientstackDll
= startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
}
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index a3fa66c..ff3f5d7 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -43,7 +43,7 @@ namespace OpenSim
void Initialise(OpenSimBase openSim);
///
- /// Called when the application loading is completed
+ /// Called when the application loading is completed
///
void PostInitialise();
}
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index d9fdcde..8022b1e 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -135,7 +135,7 @@ namespace OpenSim
{
// Wait for a signal to be delivered
int index = Mono.Unix.UnixSignal.WaitAny (signals, -1);
-
+
//Mono.Unix.Native.Signum signal = signals [index].Signum;
MainConsole.Instance.RunCommand("shutdown");
}
@@ -273,17 +273,17 @@ namespace OpenSim
m_console.Commands.AddCommand("General", false, "change region",
"change region ",
- "Change current console region",
+ "Change current console region",
ChangeSelectedRegion);
m_console.Commands.AddCommand("Archiving", false, "save xml",
"save xml []",
- "Save a region's data in XML format",
+ "Save a region's data in XML format",
SaveXml);
m_console.Commands.AddCommand("Archiving", false, "save xml2",
"save xml2 []",
- "Save a region's data in XML2 format",
+ "Save a region's data in XML2 format",
SaveXml2);
m_console.Commands.AddCommand("Archiving", false, "load xml",
@@ -293,12 +293,12 @@ namespace OpenSim
m_console.Commands.AddCommand("Archiving", false, "load xml2",
"load xml2 []",
- "Load a region's data from XML2 format",
+ "Load a region's data from XML2 format",
LoadXml2);
m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
"save prims xml2 [ ]",
- "Save named prim to XML2",
+ "Save named prim to XML2",
SavePrimsXml2);
m_console.Commands.AddCommand("Archiving", false, "load oar",
@@ -352,7 +352,7 @@ namespace OpenSim
m_console.Commands.AddCommand("Objects", false, "edit scale",
"edit scale ",
- "Change the scale of a named prim",
+ "Change the scale of a named prim",
HandleEditScale);
m_console.Commands.AddCommand("Objects", false, "rotate scene",
@@ -379,44 +379,44 @@ namespace OpenSim
m_console.Commands.AddCommand("Users", false, "show users",
"show users [full]",
- "Show user data for users currently on the region",
+ "Show user data for users currently on the region",
"Without the 'full' option, only users actually on the region are shown."
+ " With the 'full' option child agents of users in neighbouring regions are also shown.",
HandleShow);
m_console.Commands.AddCommand("Comms", false, "show connections",
"show connections",
- "Show connection data",
+ "Show connection data",
HandleShow);
m_console.Commands.AddCommand("Comms", false, "show circuits",
"show circuits",
- "Show agent circuit data",
+ "Show agent circuit data",
HandleShow);
m_console.Commands.AddCommand("Comms", false, "show pending-objects",
"show pending-objects",
- "Show # of objects on the pending queues of all scene viewers",
+ "Show # of objects on the pending queues of all scene viewers",
HandleShow);
m_console.Commands.AddCommand("General", false, "show modules",
"show modules",
- "Show module data",
+ "Show module data",
HandleShow);
m_console.Commands.AddCommand("Regions", false, "show regions",
"show regions",
- "Show region data",
+ "Show region data",
HandleShow);
-
+
m_console.Commands.AddCommand("Regions", false, "show ratings",
"show ratings",
- "Show rating data",
+ "Show rating data",
HandleShow);
m_console.Commands.AddCommand("Objects", false, "backup",
"backup",
- "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
+ "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
RunCommand);
m_console.Commands.AddCommand("Regions", false, "create region",
@@ -430,22 +430,22 @@ namespace OpenSim
m_console.Commands.AddCommand("Regions", false, "restart",
"restart",
- "Restart the currently selected region(s) in this instance",
+ "Restart the currently selected region(s) in this instance",
RunCommand);
m_console.Commands.AddCommand("General", false, "command-script",
"command-script