diff options
| author | opensim mirror account | 2010-10-21 18:00:06 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-21 18:00:06 -0700 |
| commit | 8ffea630f92693c266a5a5f90edf83f53a333c69 (patch) | |
| tree | 88e50dbd97cdb7ba783c036d36abf14952b57e85 /OpenSim/Region | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | minor: add some text to the oar abort messages on assets timeout to make it c... (diff) | |
| download | opensim-SC-8ffea630f92693c266a5a5f90edf83f53a333c69.zip opensim-SC-8ffea630f92693c266a5a5f90edf83f53a333c69.tar.gz opensim-SC-8ffea630f92693c266a5a5f90edf83f53a333c69.tar.bz2 opensim-SC-8ffea630f92693c266a5a5f90edf83f53a333c69.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region')
| -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 | { |