diff options
author | Melanie | 2010-05-21 21:16:04 +0100 |
---|---|---|
committer | Melanie | 2010-05-21 21:16:04 +0100 |
commit | 297bcb5c3d462128c5c81f35aa7a574e567583d5 (patch) | |
tree | be7744848c474a8241f1d1c0e1f0114cfb824e16 /OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.zip opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.gz opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.bz2 opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 0ec3cc3..e3965ce 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -123,8 +123,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
123 | 123 | ||
124 | foreach (SceneObjectPart part in sceneObject.GetParts()) | 124 | foreach (SceneObjectPart part in sceneObject.GetParts()) |
125 | { | 125 | { |
126 | //m_log.DebugFormat( | 126 | // m_log.DebugFormat( |
127 | // "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID); | 127 | // "[ARCHIVER]: Getting part {0}, {1} for object {2}", part.Name, part.UUID, sceneObject.UUID); |
128 | 128 | ||
129 | try | 129 | try |
130 | { | 130 | { |
@@ -155,7 +155,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
155 | // Now analyze this prim's inventory items to preserve all the uuids that they reference | 155 | // Now analyze this prim's inventory items to preserve all the uuids that they reference |
156 | foreach (TaskInventoryItem tii in taskDictionary.Values) | 156 | foreach (TaskInventoryItem tii in taskDictionary.Values) |
157 | { | 157 | { |
158 | //m_log.DebugFormat("[ARCHIVER]: Analysing item asset type {0}", tii.Type); | 158 | // m_log.DebugFormat( |
159 | // "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", | ||
160 | // tii.Name, tii.Type, part.Name, part.UUID); | ||
159 | 161 | ||
160 | if (!assetUuids.ContainsKey(tii.AssetID)) | 162 | if (!assetUuids.ContainsKey(tii.AssetID)) |
161 | GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids); | 163 | GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids); |