diff options
| author | Diva Canto | 2009-08-12 20:40:49 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-12 20:40:49 -0700 |
| commit | b0292d59a54fab6f7e825d6f0e5f0517d56243a6 (patch) | |
| tree | 3c49fe36db9167babb7c8c44758a9755cd02b271 /OpenSim/Framework/Servers | |
| parent | Redirected all calls to CachedUserProfile methods to the inventory service. R... (diff) | |
| parent | minor:comments (diff) | |
| download | opensim-SC_OLD-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.zip opensim-SC_OLD-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.tar.gz opensim-SC_OLD-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.tar.bz2 opensim-SC_OLD-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 2a97528..7a244ff 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -443,7 +443,7 @@ namespace OpenSim.Framework.Servers | |||
| 443 | string inputLine; | 443 | string inputLine; |
| 444 | int strcmp; | 444 | int strcmp; |
| 445 | 445 | ||
| 446 | if (File.Exists( gitCommitFileName)) | 446 | if (File.Exists(gitCommitFileName)) |
| 447 | { | 447 | { |
| 448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); | 448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); |
| 449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); | 449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); |