OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge

avinationmerge
Melanie 2011-10-25 03:19:55 +01:00
parent 271c798813 b868328d51
commit e94574196f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@ -240,21 +240,21 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="assetUuids">Dictionary in which to record the references</param> /// <param name="assetUuids">Dictionary in which to record the references</param>
private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids) private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids)
{ {
m_log.DebugFormat("[ASSET GATHERER]: Getting assets for asset {0}", embeddingAssetId); // m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
AssetBase embeddingAsset = GetAsset(embeddingAssetId); AssetBase embeddingAsset = GetAsset(embeddingAssetId);
if (null != embeddingAsset) if (null != embeddingAsset)
{ {
string script = Utils.BytesToString(embeddingAsset.Data); string script = Utils.BytesToString(embeddingAsset.Data);
m_log.DebugFormat("[ARCHIVER]: Script {0}", script); // m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(script); MatchCollection uuidMatches = Util.PermissiveUUIDPattern.Matches(script);
m_log.DebugFormat("[ARCHIVER]: Found {0} matches in text", uuidMatches.Count); // m_log.DebugFormat("[ARCHIVER]: Found {0} matches in text", uuidMatches.Count);
foreach (Match uuidMatch in uuidMatches) foreach (Match uuidMatch in uuidMatches)
{ {
UUID uuid = new UUID(uuidMatch.Value); UUID uuid = new UUID(uuidMatch.Value);
m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid); // m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid);
// Assume AssetIDs embedded are textures. // Assume AssetIDs embedded are textures.
assetUuids[uuid] = AssetType.Texture; assetUuids[uuid] = AssetType.Texture;