diff options
author | Justin Clarke Casey | 2009-06-02 15:24:29 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-06-02 15:24:29 +0000 |
commit | 5c42143a7b17b68c9a33df9d6da3780b58f31f43 (patch) | |
tree | f112835614efeef7faeb65a42fc8227a66ac21fe /OpenSim/Region/CoreModules/World/Archiver | |
parent | Explicitly set the changed status of the prim groups affected in a delink (diff) | |
download | opensim-SC-5c42143a7b17b68c9a33df9d6da3780b58f31f43.zip opensim-SC-5c42143a7b17b68c9a33df9d6da3780b58f31f43.tar.gz opensim-SC-5c42143a7b17b68c9a33df9d6da3780b58f31f43.tar.bz2 opensim-SC-5c42143a7b17b68c9a33df9d6da3780b58f31f43.tar.xz |
* Add simple original xml serialization test
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 129d6d3..c459a66 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -101,7 +101,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | private bool done = false; | ||
105 | /// <summary> | 104 | /// <summary> |
106 | /// Called back by the asset cache when it has the asset | 105 | /// Called back by the asset cache when it has the asset |
107 | /// </summary> | 106 | /// </summary> |
@@ -127,14 +126,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
127 | 126 | ||
128 | if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count == m_repliesRequired) | 127 | if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count == m_repliesRequired) |
129 | { | 128 | { |
130 | if (done) | ||
131 | throw new Exception("AArgh"); | ||
132 | |||
133 | m_log.DebugFormat( | 129 | m_log.DebugFormat( |
134 | "[ARCHIVER]: Successfully added {0} assets ({1} assets missing)", | 130 | "[ARCHIVER]: Successfully added {0} assets ({1} assets notified missing)", |
135 | m_foundAssetUuids.Count, m_notFoundAssetUuids.Count); | 131 | m_foundAssetUuids.Count, m_notFoundAssetUuids.Count); |
136 | |||
137 | done = true; | ||
138 | 132 | ||
139 | // We want to stop using the asset cache thread asap | 133 | // We want to stop using the asset cache thread asap |
140 | // as we now need to do the work of producing the rest of the archive | 134 | // as we now need to do the work of producing the rest of the archive |
@@ -146,7 +140,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
146 | } | 140 | } |
147 | catch (Exception e) | 141 | catch (Exception e) |
148 | { | 142 | { |
149 | m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); | 143 | m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); |
150 | } | 144 | } |
151 | } | 145 | } |
152 | 146 | ||