diff options
| author | UbitUmarov | 2015-09-14 00:05:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-14 00:05:25 +0100 |
| commit | 4386ee886dbd322a2905bc6b6dc985b06f5c239e (patch) | |
| tree | f7d8b2e932be8ffb7477007b11c821ce8204d37b /OpenSim/Framework | |
| parent | change interface version to 8, as core (diff) | |
| parent | Remove the last proprietary copyright headers, insert BSD ones. (diff) | |
| download | opensim-SC-4386ee886dbd322a2905bc6b6dc985b06f5c239e.zip opensim-SC-4386ee886dbd322a2905bc6b6dc985b06f5c239e.tar.gz opensim-SC-4386ee886dbd322a2905bc6b6dc985b06f5c239e.tar.bz2 opensim-SC-4386ee886dbd322a2905bc6b6dc985b06f5c239e.tar.xz | |
Merge branch 'ubitworkvarnew' of ssh://3dhosting.de/var/git/careminster into ubitworkvarnew
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 09b0801..c533a2e 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -152,7 +152,7 @@ namespace OpenSim.Framework.Servers | |||
| 152 | { | 152 | { |
| 153 | m_log.Info("[STARTUP]: Beginning startup processing"); | 153 | m_log.Info("[STARTUP]: Beginning startup processing"); |
| 154 | 154 | ||
| 155 | m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine); | 155 | m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine); |
| 156 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | 156 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and |
| 157 | // the clr version number doesn't match the project version number under Mono. | 157 | // the clr version number doesn't match the project version number under Mono. |
| 158 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); | 158 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); |
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 5ebecb6..ad39845 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
| @@ -51,7 +51,7 @@ namespace OpenSim | |||
| 51 | 51 | ||
| 52 | public static string GetVersionString(string versionNumber, Flavour flavour) | 52 | public static string GetVersionString(string versionNumber, Flavour flavour) |
| 53 | { | 53 | { |
| 54 | string versionString = "Careminster " + versionNumber + " " + flavour; | 54 | string versionString = "OpenSimulator" + versionNumber + " " + flavour; |
| 55 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); | 55 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); |
| 56 | } | 56 | } |
| 57 | 57 | ||