From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 25 May 2008 23:27:38 +0000 Subject: Update svn properties. Formatting cleanup. --- OpenSim/Region/Application/OpenSimMain.cs | 16 ++++++++-------- OpenSim/Region/Application/OpenSimMainConsole.cs | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cf12be7..dec0311 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -66,7 +66,7 @@ namespace OpenSim /// The file used to load and save prim backup xml if none has been specified /// protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; - + /// /// The file use to load and save an opensim archive if none has been specified /// @@ -354,7 +354,7 @@ namespace OpenSim } /// - /// Enhance the version string with extra information if it's available. + /// Enhance the version string with extra information if it's available. /// protected void EnhanceVersionInformation() { @@ -387,7 +387,7 @@ namespace OpenSim if (!string.IsNullOrEmpty(buildVersion)) { VersionInfo.Version += ", SVN build r" + buildVersion; - } + } else { VersionInfo.Version += ", SVN build revision not available"; @@ -407,9 +407,9 @@ namespace OpenSim if (OSString.Length > 45) { OSString = OSString.Substring(0, 45); - } - - VersionInfo.Version += ", OS " + OSString; + } + + VersionInfo.Version += ", OS " + OSString; } /// @@ -418,7 +418,7 @@ namespace OpenSim protected void InternalStartUp() { EnhanceVersionInformation(); - + m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); m_stats = StatsManager.StartCollectingSimExtraStats(); @@ -710,7 +710,7 @@ namespace OpenSim /// protected class SimStatusHandler : IStreamedRequestHandler { - public byte[] Handle(string path, Stream request, + public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return Encoding.UTF8.GetBytes("OK"); diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index dd14c59..e4590f2 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs @@ -291,7 +291,7 @@ namespace OpenSim break; case "save-xml": m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); - + if (cmdparams.Length > 0) { m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); @@ -304,7 +304,7 @@ namespace OpenSim case "load-xml": m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); - + LLVector3 loadOffset = new LLVector3(0, 0, 0); if (cmdparams.Length > 0) { @@ -359,10 +359,10 @@ namespace OpenSim m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); } break; - + case "save-oar": m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); - + if (cmdparams.Length > 0) { m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); @@ -371,7 +371,7 @@ namespace OpenSim { m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); } - break; + break; case "plugin": m_sceneManager.SendCommandToPluginModules(cmdparams); @@ -597,9 +597,9 @@ namespace OpenSim case "users": IList agents = m_sceneManager.GetCurrentSceneAvatars(); - + m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); - + m_console.Notice( String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", "Agent ID","Region")); @@ -627,7 +627,7 @@ namespace OpenSim presence.UUID, regionName)); } - + m_console.Notice(""); break; -- cgit v1.1