ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-05-28 21:56:42 +01:00
parent ea5bcc7b88 191db0e6a4
commit 542e6b8af4
22 changed files with 1127 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/Console/CommandConsole.cs
View File

@@ -141,7 +141,17 @@ namespace OpenSim.Framework.Console
CommandInfo commandInfo = (CommandInfo)dict[String.Empty];
help.Add(commandInfo.help_text);
help.Add(commandInfo.long_help);
string descriptiveHelp = commandInfo.descriptive_help;
// If we do have some descriptive help then insert a spacing line before and after for readability.
if (descriptiveHelp != string.Empty)
help.Add(string.Empty);
help.Add(commandInfo.descriptive_help);
if (descriptiveHelp != string.Empty)
help.Add(string.Empty);
}
else
{
@@ -182,8 +192,7 @@ namespace OpenSim.Framework.Console
public void AddCommand(string module, bool shared, string command,
string help, string longhelp, CommandDelegate fn)
{
AddCommand(module, shared, command, help, longhelp,
String.Empty, fn);
AddCommand(module, shared, command, help, longhelp, String.Empty, fn);
}
/// <summary>

6
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -286,7 +286,11 @@ namespace OpenSim.Framework.Servers
EnhanceVersionInformation();
m_log.Info("[STARTUP]: Version: " + m_version + "\n");
m_log.Info("[STARTUP]: OpenSimulator 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.
//m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine);
StartupSpecific();