diff options
| author | John Hurliman | 2010-04-22 18:56:06 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-22 18:56:06 -0700 |
| commit | 8692ac53f56c8db9942021709e7415b2b2add0c6 (patch) | |
| tree | 5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Region/DataSnapshot | |
| parent | * Better error logging for failed SimianGrid web service calls (diff) | |
| parent | Insert a ROLLBACK command on migration step failure. This ensures that (diff) | |
| download | opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.zip opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2 opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 6949d7c..9fc002b 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
| @@ -94,7 +94,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 94 | if (!m_configLoaded) | 94 | if (!m_configLoaded) |
| 95 | { | 95 | { |
| 96 | m_configLoaded = true; | 96 | m_configLoaded = true; |
| 97 | m_log.Info("[DATASNAPSHOT]: Loading configuration"); | 97 | //m_log.Debug("[DATASNAPSHOT]: Loading configuration"); |
| 98 | //Read from the config for options | 98 | //Read from the config for options |
| 99 | lock (m_syncInit) | 99 | lock (m_syncInit) |
| 100 | { | 100 | { |
| @@ -123,7 +123,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 123 | } | 123 | } |
| 124 | catch (Exception) | 124 | catch (Exception) |
| 125 | { | 125 | { |
| 126 | m_log.Info("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled."); | 126 | m_log.Warn("[DATASNAPSHOT]: Could not load configuration. DataSnapshot will be disabled."); |
| 127 | m_enabled = false; | 127 | m_enabled = false; |
| 128 | return; | 128 | return; |
| 129 | } | 129 | } |
| @@ -179,7 +179,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 179 | } | 179 | } |
| 180 | else | 180 | else |
| 181 | { | 181 | { |
| 182 | m_log.Warn("[DATASNAPSHOT]: Data snapshot disabled, not adding scene to module (or anything else)."); | 182 | //m_log.Debug("[DATASNAPSHOT]: Data snapshot disabled, not adding scene to module (or anything else)."); |
| 183 | } | 183 | } |
| 184 | } | 184 | } |
| 185 | 185 | ||