diff options
| author | UbitUmarov | 2016-07-09 13:46:20 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-09 13:46:20 +0100 |
| commit | 8d27abd3b44af433e613fec9a80922cf3ec9c5a9 (patch) | |
| tree | 4045563318326569394501e979389c5d0cb9c50f | |
| parent | kick Xfermanager from heartbeat and expires files based on its timming (diff) | |
| parent | Fixed the order of two file names used in a warning. (diff) | |
| download | opensim-SC-8d27abd3b44af433e613fec9a80922cf3ec9c5a9.zip opensim-SC-8d27abd3b44af433e613fec9a80922cf3ec9c5a9.tar.gz opensim-SC-8d27abd3b44af433e613fec9a80922cf3ec9c5a9.tar.bz2 opensim-SC-8d27abd3b44af433e613fec9a80922cf3ec9c5a9.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 65b2a5c..1b3a4c3 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1303,7 +1303,7 @@ namespace OpenSim.Framework | |||
| 1303 | } | 1303 | } |
| 1304 | catch (Exception e) | 1304 | catch (Exception e) |
| 1305 | { | 1305 | { |
| 1306 | m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", configFile, exampleConfigFile, e.Message); | 1306 | m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", exampleConfigFile, configFile, e.Message); |
| 1307 | return false; | 1307 | return false; |
| 1308 | } | 1308 | } |
| 1309 | } | 1309 | } |