aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2015-09-13 21:03:38 +0200
committerMelanie Thielker2015-09-13 21:03:38 +0200
commitf24414c063261d279490a73510af413da6d05d7b (patch)
tree3f56b2e9232378c0370a8720118d06f5a8ea9f8b /OpenSim/Framework
parentchange the names also on the assembyInfo files (diff)
downloadopensim-SC-f24414c063261d279490a73510af413da6d05d7b.zip
opensim-SC-f24414c063261d279490a73510af413da6d05d7b.tar.gz
opensim-SC-f24414c063261d279490a73510af413da6d05d7b.tar.bz2
opensim-SC-f24414c063261d279490a73510af413da6d05d7b.tar.xz
Remove the last proprietary copyright headers, insert BSD ones.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
-rw-r--r--OpenSim/Framework/VersionInfo.cs2
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 165b2b4..8d500bd 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