diff options
| author | Jonathan Freedman | 2010-10-24 14:51:38 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-24 14:51:38 -0400 |
| commit | 6b9660eb9685b9e89091547c662ce58d1145dd24 (patch) | |
| tree | d210e8fbe05f0a30eb306103542a05f6ba5ddcf0 /OpenSim/Region/CoreModules | |
| parent | * throw debug message when no HomeURI is set (diff) | |
| parent | Change some exception to use ToString(). e.Message is not sufficient to fix (diff) | |
| download | opensim-SC_OLD-6b9660eb9685b9e89091547c662ce58d1145dd24.zip opensim-SC_OLD-6b9660eb9685b9e89091547c662ce58d1145dd24.tar.gz opensim-SC_OLD-6b9660eb9685b9e89091547c662ce58d1145dd24.tar.bz2 opensim-SC_OLD-6b9660eb9685b9e89091547c662ce58d1145dd24.tar.xz | |
Merge branch 'master' into mantis5110
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index a1451ce..d4a09b4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
| @@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 188 | m_log.ErrorFormat( | 188 | m_log.ErrorFormat( |
| 189 | "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); | 189 | "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); |
| 190 | 190 | ||
| 191 | m_log.Error("[ARCHIVER]: OAR save aborted."); | 191 | m_log.Error("[ARCHIVER]: OAR save aborted. PLEASE DO NOT USE THIS OAR, IT WILL BE INCOMPLETE."); |
| 192 | } | 192 | } |
| 193 | catch (Exception e) | 193 | catch (Exception e) |
| 194 | { | 194 | { |