Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2013-01-24 23:25:38 +00:00
9 changed files with 54 additions and 18 deletions

View File

@@ -573,7 +573,7 @@ namespace OpenSim.Framework.Servers
}
}
protected string GetVersionText()
public string GetVersionText()
{
return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion);
}
@@ -674,4 +674,4 @@ namespace OpenSim.Framework.Servers
m_console.OutputFormat(format, components);
}
}
}
}