diff options
author | Melanie | 2011-10-25 03:19:55 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 03:19:55 +0100 |
commit | e94574196ff49c10de1da898963a16936ac7b370 (patch) | |
tree | 9f12fe9ab598d905eed6756852fce101ee20915f /OpenSim/Region | |
parent | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge (diff) | |
parent | Comment out the uuid gatherer lines that I accidentally left in. (diff) | |
download | opensim-SC-e94574196ff49c10de1da898963a16936ac7b370.zip opensim-SC-e94574196ff49c10de1da898963a16936ac7b370.tar.gz opensim-SC-e94574196ff49c10de1da898963a16936ac7b370.tar.bz2 opensim-SC-e94574196ff49c10de1da898963a16936ac7b370.tar.xz |
Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 313dc99..411e421 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -240,21 +240,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
240 | /// <param name="assetUuids">Dictionary in which to record the references</param> | 240 | /// <param name="assetUuids">Dictionary in which to record the references</param> |
241 | private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids) | 241 | private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids) |
242 | { | 242 | { |
243 | m_log.DebugFormat("[ASSET GATHERER]: Getting assets for asset {0}", embeddingAssetId); | 243 | // m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId); |
244 | 244 | ||
245 | AssetBase embeddingAsset = GetAsset(embeddingAssetId); | 245 | AssetBase embeddingAsset = GetAsset(embeddingAssetId); |
246 | 246 | ||
247 | if (null != embeddingAsset) | 247 | if (null != embeddingAsset) |
248 | { | 248 | { |
249 | string script = Utils.BytesToString(embeddingAsset.Data); | 249 | string script = Utils.BytesToString(embeddingAsset.Data); |
250 | m_log.DebugFormat("[ARCHIVER]: Script {0}", script); | 250 | // m_log.DebugFormat("[ARCHIVER]: Script {0}", script); |
251 | MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(script); | 251 | MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(script); |
252 | m_log.DebugFormat("[ARCHIVER]: Found {0} matches in text", uuidMatches.Count); | 252 | // m_log.DebugFormat("[ARCHIVER]: Found {0} matches in text", uuidMatches.Count); |
253 | 253 | ||
254 | foreach (Match uuidMatch in uuidMatches) | 254 | foreach (Match uuidMatch in uuidMatches) |
255 | { | 255 | { |
256 | UUID uuid = new UUID(uuidMatch.Value); | 256 | UUID uuid = new UUID(uuidMatch.Value); |
257 | m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid); | 257 | // m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid); |
258 | 258 | ||
259 | // Assume AssetIDs embedded are textures. | 259 | // Assume AssetIDs embedded are textures. |
260 | assetUuids[uuid] = AssetType.Texture; | 260 | assetUuids[uuid] = AssetType.Texture; |