diff options
| author | Melanie Thielker | 2016-07-11 22:32:27 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-07-11 22:32:27 +0100 |
| commit | f87d5d07808d19fa53d0fb71cde06519701491e1 (patch) | |
| tree | a142a866062b3a4406ace454a8ea9f43c6dcd9a8 /OpenSim/Framework | |
| parent | Change the user verification call back to use the host name instead of the (diff) | |
| parent | reduce xfer burst if we are busy (diff) | |
| download | opensim-SC_OLD-f87d5d07808d19fa53d0fb71cde06519701491e1.zip opensim-SC_OLD-f87d5d07808d19fa53d0fb71cde06519701491e1.tar.gz opensim-SC_OLD-f87d5d07808d19fa53d0fb71cde06519701491e1.tar.bz2 opensim-SC_OLD-f87d5d07808d19fa53d0fb71cde06519701491e1.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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 | } |