diff options
author | Justin Clark-Casey (justincc) | 2012-05-07 20:01:17 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-07 20:01:17 +0100 |
commit | 5d1d47e1f9327c29ba26d231c8d18680d06cb1d9 (patch) | |
tree | e8ea043822e96172526b77bda40f488926016c30 /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |
parent | Log the full exception when errors occur in BaseHttpServer (diff) | |
download | opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.zip opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.tar.gz opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.tar.bz2 opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.tar.xz |
Revert "Better error handling if Load OAR or Save OAR fail"
This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8.
Yet again I accidentally committed something whilst evaluating it.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index e360f93..a6dbaba 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -200,8 +200,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
200 | } | 200 | } |
201 | catch (Exception e) | 201 | catch (Exception e) |
202 | { | 202 | { |
203 | m_log.Error( | 203 | m_log.ErrorFormat( |
204 | String.Format("[ARCHIVER]: Aborting load with error in archive file {0} ", filePath), e); | 204 | "[ARCHIVER]: Aborting load with error in archive file {0}. {1}", filePath, e); |
205 | m_errorMessage += e.ToString(); | 205 | m_errorMessage += e.ToString(); |
206 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); | 206 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); |
207 | return; | 207 | return; |
@@ -219,7 +219,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
219 | { | 219 | { |
220 | m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); | 220 | m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); |
221 | m_errorMessage += String.Format("Failed to load {0} assets", failedAssetRestores); | 221 | m_errorMessage += String.Format("Failed to load {0} assets", failedAssetRestores); |
222 | // Continue, because we allow the OAR to be loaded even if some assets fail | ||
223 | } | 222 | } |
224 | } | 223 | } |
225 | 224 | ||
@@ -229,19 +228,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
229 | m_scene.DeleteAllSceneObjects(); | 228 | m_scene.DeleteAllSceneObjects(); |
230 | } | 229 | } |
231 | 230 | ||
232 | try | 231 | LoadParcels(serialisedParcels); |
233 | { | 232 | LoadObjects(serialisedSceneObjects); |
234 | LoadParcels(serialisedParcels); | ||
235 | LoadObjects(serialisedSceneObjects); | ||
236 | } | ||
237 | catch (Exception e) | ||
238 | { | ||
239 | m_log.Error("[ARCHIVER]: Error loading parcels or objects ", e); | ||
240 | m_errorMessage += e.ToString(); | ||
241 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); | ||
242 | return; | ||
243 | } | ||
244 | |||
245 | 233 | ||
246 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); | 234 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); |
247 | 235 | ||