diff options
| author | Melanie | 2009-11-28 09:26:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-28 09:26:00 +0000 |
| commit | d3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch) | |
| tree | 044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Framework | |
| parent | Reset update flag when a SOG is deleted. This fixes llDie(); (diff) | |
| parent | Add some conditionals to references to the WorldComm module, so that the (diff) | |
| download | opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2 opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -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 | } |