diff options
author | Justin Clarke Casey | 2008-05-07 23:59:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-07 23:59:57 +0000 |
commit | d8aaf2ccf11f67277544c5d72ed7dadd63e93ae2 (patch) | |
tree | e53af5a2b94126ee0220995828b9fc0e4951a790 /OpenSim/Region/Application/OpenSimMainConsole.cs | |
parent | * Change LSL -> C# translated script console output to use the logger (at DEB... (diff) | |
download | opensim-SC-d8aaf2ccf11f67277544c5d72ed7dadd63e93ae2.zip opensim-SC-d8aaf2ccf11f67277544c5d72ed7dadd63e93ae2.tar.gz opensim-SC-d8aaf2ccf11f67277544c5d72ed7dadd63e93ae2.tar.bz2 opensim-SC-d8aaf2ccf11f67277544c5d72ed7dadd63e93ae2.tar.xz |
* For no good reason (since there are a hundred million other things to fix), change formatting of version information printed to the log
* Push printing down into OpenSimMain so both console and consoleless configurations will get it
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMainConsole.cs | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index ab835ba..2653273 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs | |||
@@ -55,7 +55,6 @@ namespace OpenSim | |||
55 | 55 | ||
56 | private string m_timedScript = "disabled"; | 56 | private string m_timedScript = "disabled"; |
57 | private Timer m_scriptTimer; | 57 | private Timer m_scriptTimer; |
58 | private string buildVersion = null; | ||
59 | 58 | ||
60 | public OpenSimMainConsole(IConfigSource configSource) | 59 | public OpenSimMainConsole(IConfigSource configSource) |
61 | : base(configSource) | 60 | : base(configSource) |
@@ -112,42 +111,8 @@ namespace OpenSim | |||
112 | m_scriptTimer.Interval = 1200 * 1000; | 111 | m_scriptTimer.Interval = 1200 * 1000; |
113 | m_scriptTimer.Elapsed += RunAutoTimerScript; | 112 | m_scriptTimer.Elapsed += RunAutoTimerScript; |
114 | } | 113 | } |
114 | |||
115 | PrintFileToConsole("startuplogo.txt"); | 115 | PrintFileToConsole("startuplogo.txt"); |
116 | |||
117 | // Set BuildVersion String for Show version command | ||
118 | string svnFileName = "../.svn/entries"; | ||
119 | string inputLine = null; | ||
120 | int strcmp; | ||
121 | |||
122 | if (File.Exists(svnFileName)) | ||
123 | { | ||
124 | StreamReader EntriesFile = File.OpenText(svnFileName); | ||
125 | inputLine = EntriesFile.ReadLine(); | ||
126 | while (inputLine != null) | ||
127 | { | ||
128 | // using the dir svn revision at the top of entries file | ||
129 | strcmp = String.Compare(inputLine, "dir"); | ||
130 | if (strcmp == 0) | ||
131 | { | ||
132 | buildVersion = EntriesFile.ReadLine(); | ||
133 | break; | ||
134 | } | ||
135 | else | ||
136 | { | ||
137 | inputLine = EntriesFile.ReadLine(); | ||
138 | } | ||
139 | } | ||
140 | EntriesFile.Close(); | ||
141 | } | ||
142 | |||
143 | if ((buildVersion != null) && (buildVersion.Length > 0)) | ||
144 | { | ||
145 | m_log.Info("OpenSim " + VersionInfo.Version + " r" + buildVersion + "\n"); | ||
146 | } | ||
147 | else | ||
148 | { | ||
149 | m_log.Info("OpenSim " + VersionInfo.Version + "\n"); | ||
150 | } | ||
151 | } | 116 | } |
152 | 117 | ||
153 | protected ConsoleBase CreateConsole() | 118 | protected ConsoleBase CreateConsole() |