diff options
author | Justin Clarke Casey | 2008-11-28 21:09:20 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-28 21:09:20 +0000 |
commit | 8527f23c59674cdf89c8808c88f3e77a11a291a2 (patch) | |
tree | db57a31461d16e33de20277bd2dba171c7826d70 | |
parent | * minor: remove mono compiler warning (diff) | |
download | opensim-SC-8527f23c59674cdf89c8808c88f3e77a11a291a2.zip opensim-SC-8527f23c59674cdf89c8808c88f3e77a11a291a2.tar.gz opensim-SC-8527f23c59674cdf89c8808c88f3e77a11a291a2.tar.bz2 opensim-SC-8527f23c59674cdf89c8808c88f3e77a11a291a2.tar.xz |
* Stop console misleadingly reporting an error if it cannot find a startup commands file
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 1999737..64989ea 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -170,14 +170,15 @@ namespace OpenSim | |||
170 | } | 170 | } |
171 | 171 | ||
172 | /// <summary> | 172 | /// <summary> |
173 | /// | 173 | /// Run an optional startup list of commands |
174 | /// </summary> | 174 | /// </summary> |
175 | /// <param name="fileName"></param> | 175 | /// <param name="fileName"></param> |
176 | private void RunCommandScript(string fileName) | 176 | private void RunCommandScript(string fileName) |
177 | { | 177 | { |
178 | m_log.Info("[COMMANDFILE]: Running " + fileName); | ||
179 | if (File.Exists(fileName)) | 178 | if (File.Exists(fileName)) |
180 | { | 179 | { |
180 | m_log.Info("[COMMANDFILE]: Running " + fileName); | ||
181 | |||
181 | StreamReader readFile = File.OpenText(fileName); | 182 | StreamReader readFile = File.OpenText(fileName); |
182 | string currentCommand; | 183 | string currentCommand; |
183 | while ((currentCommand = readFile.ReadLine()) != null) | 184 | while ((currentCommand = readFile.ReadLine()) != null) |
@@ -189,10 +190,6 @@ namespace OpenSim | |||
189 | } | 190 | } |
190 | } | 191 | } |
191 | } | 192 | } |
192 | else | ||
193 | { | ||
194 | m_log.Error("[COMMANDFILE]: Command script missing. Can not run commands"); | ||
195 | } | ||
196 | } | 193 | } |
197 | 194 | ||
198 | private static void PrintFileToConsole(string fileName) | 195 | private static void PrintFileToConsole(string fileName) |