diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-27 19:17:54 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-27 19:17:54 -0500 |
| commit | e7333515d95f063ce5dfe714b4cf34db85549a90 (patch) | |
| tree | cf320591d49e96c67baffdb1f96c4165eafc2741 /OpenSim/Framework | |
| parent | * Re-enable lightweight packet tracking stats on a 3000 ms interval. (diff) | |
| parent | Rename TestAssetDataPlugin to MockAssetDataPlugin (diff) | |
| download | opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.zip opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.gz opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.bz2 opensim-SC_OLD-e7333515d95f063ce5dfe714b4cf34db85549a90.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 0d93ff7..655df9d 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -442,7 +442,7 @@ namespace OpenSim.Framework.Servers | |||
| 442 | if (File.Exists(gitCommitFileName)) | 442 | if (File.Exists(gitCommitFileName)) |
| 443 | { | 443 | { |
| 444 | StreamReader CommitFile = File.OpenText(gitCommitFileName); | 444 | StreamReader CommitFile = File.OpenText(gitCommitFileName); |
| 445 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); | 445 | buildVersion = CommitFile.ReadLine(); |
| 446 | CommitFile.Close(); | 446 | CommitFile.Close(); |
| 447 | m_version += buildVersion ?? ""; | 447 | m_version += buildVersion ?? ""; |
| 448 | } | 448 | } |