diff options
author | Justin Clarke Casey | 2008-06-05 01:29:52 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-05 01:29:52 +0000 |
commit | 677e2ca3305a2c639ecaf360413b2d723adde382 (patch) | |
tree | 6b180da255d639a1e061d292c7d828e9b21472f3 /OpenSim/Region/Environment/Modules/World | |
parent | * If a client thread crashes, make an attempt to notify the client and clean ... (diff) | |
download | opensim-SC_OLD-677e2ca3305a2c639ecaf360413b2d723adde382.zip opensim-SC_OLD-677e2ca3305a2c639ecaf360413b2d723adde382.tar.gz opensim-SC_OLD-677e2ca3305a2c639ecaf360413b2d723adde382.tar.bz2 opensim-SC_OLD-677e2ca3305a2c639ecaf360413b2d723adde382.tar.xz |
* refactor: rename now inaccurate textureUuids to assetUuids
* 5000 commits in this repository!
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs index 0a710b8..eab80ac 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
66 | 66 | ||
67 | protected void ArchiveRegion() | 67 | protected void ArchiveRegion() |
68 | { | 68 | { |
69 | Dictionary<LLUUID, int> textureUuids = new Dictionary<LLUUID, int>(); | 69 | Dictionary<LLUUID, int> assetUuids = new Dictionary<LLUUID, int>(); |
70 | 70 | ||
71 | List<EntityBase> entities = m_scene.GetEntities(); | 71 | List<EntityBase> entities = m_scene.GetEntities(); |
72 | 72 | ||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
86 | if (texture != null) | 86 | if (texture != null) |
87 | { | 87 | { |
88 | //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++); | 88 | //m_log.DebugFormat("[ARCHIVER]: Got face {0}", i++); |
89 | textureUuids[texture.TextureID] = 1; | 89 | assetUuids[texture.TextureID] = 1; |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
95 | if (tit.Type != (int)InventoryType.Object) | 95 | if (tit.Type != (int)InventoryType.Object) |
96 | { | 96 | { |
97 | m_log.DebugFormat("[ARCHIVER]: Recording asset {0} in object {1}", tit.AssetID, part.UUID); | 97 | m_log.DebugFormat("[ARCHIVER]: Recording asset {0} in object {1}", tit.AssetID, part.UUID); |
98 | textureUuids[tit.AssetID] = 1; | 98 | assetUuids[tit.AssetID] = 1; |
99 | } | 99 | } |
100 | } | 100 | } |
101 | } | 101 | } |
@@ -107,10 +107,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
107 | if (m_serializedEntities != null && m_serializedEntities.Length > 0) | 107 | if (m_serializedEntities != null && m_serializedEntities.Length > 0) |
108 | { | 108 | { |
109 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); | 109 | m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); |
110 | m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} textures", textureUuids.Count); | 110 | m_log.DebugFormat("[ARCHIVER]: Requiring save of {0} textures", assetUuids.Count); |
111 | 111 | ||
112 | // Asynchronously request all the assets required to perform this archive operation | 112 | // Asynchronously request all the assets required to perform this archive operation |
113 | new AssetsRequest(ReceivedAllAssets, m_scene.AssetCache, textureUuids.Keys); | 113 | new AssetsRequest(ReceivedAllAssets, m_scene.AssetCache, assetUuids.Keys); |
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||