diff options
author | Justin Clark-Casey (justincc) | 2010-05-21 19:36:39 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-21 19:36:39 +0100 |
commit | 74ef1ed36f234d93aa3d58b1602344bcb3e00d6e (patch) | |
tree | 4d2cea7595c5ae54fc8eff50f541b4716660c256 /OpenSim/Region/Framework/Scenes | |
parent | Only send dialogs and notices to root agents, not child agents (diff) | |
download | opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.zip opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.gz opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.bz2 opensim-SC_OLD-74ef1ed36f234d93aa3d58b1602344bcb3e00d6e.tar.xz |
add prim item and test asset save in save oar unit test
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index 8b80ebe..5e6124b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |||
@@ -58,7 +58,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
58 | TestHelper.InMethod(); | 58 | TestHelper.InMethod(); |
59 | 59 | ||
60 | UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 60 | UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
61 | AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET", UUID.Zero); | 61 | AssetBase corruptAsset |
62 | = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero); | ||
62 | m_assetService.Store(corruptAsset); | 63 | m_assetService.Store(corruptAsset); |
63 | 64 | ||
64 | IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); | 65 | IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); |
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); |