aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseOpenSimServer.cs
diff options
context:
space:
mode:
authordahlia2009-11-30 01:09:46 -0800
committerdahlia2009-11-30 01:09:46 -0800
commit5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Framework/Servers/BaseOpenSimServer.cs
parentadd agent position to output of "show users" console command (diff)
parent* Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
downloadopensim-SC_OLD-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip
opensim-SC_OLD-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz
opensim-SC_OLD-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2
opensim-SC_OLD-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
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 }