aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/UuidGatherer.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 37b91d3..93406cb 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes
92 /// <param name="assetService"> 92 /// <param name="assetService">
93 /// Asset service. 93 /// Asset service.
94 /// </param> 94 /// </param>
95 public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {} 95 public UuidGatherer(IAssetService assetService) : this(assetService, new Dictionary<UUID, sbyte>()) {}
96 96
97 /// <summary> 97 /// <summary>
98 /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class. 98 /// Initializes a new instance of the <see cref="OpenSim.Region.Framework.Scenes.UuidGatherer"/> class.
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Scenes
101 /// Asset service. 101 /// Asset service.
102 /// </param> 102 /// </param>
103 /// <param name="collector"> 103 /// <param name="collector">
104 /// Gathered UUIDs will be collected in this dictinaory. 104 /// Gathered UUIDs will be collected in this dictinaory.
105 /// It can be pre-populated if you want to stop the gatherer from analyzing assets that have already been fetched and inspected. 105 /// It can be pre-populated if you want to stop the gatherer from analyzing assets that have already been fetched and inspected.
106 /// </param> 106 /// </param>
107 public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector) 107 public UuidGatherer(IAssetService assetService, IDictionary<UUID, sbyte> collector)
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes
128 m_assetUuidsToInspect.Enqueue(uuid); 128 m_assetUuidsToInspect.Enqueue(uuid);
129 return true; 129 return true;
130 } 130 }
131 131
132 /// <summary> 132 /// <summary>
133 /// Gather all the asset uuids associated with a given object. 133 /// Gather all the asset uuids associated with a given object.
134 /// </summary> 134 /// </summary>
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes
194 catch (Exception) 194 catch (Exception)
195 { 195 {
196 m_log.WarnFormat( 196 m_log.WarnFormat(
197 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.", 197 "[UUID GATHERER]: Could not check particle system for part {0} {1} in object {2} {3} since it is corrupt. Continuing.",
198 part.Name, part.UUID, sceneObject.Name, sceneObject.UUID); 198 part.Name, part.UUID, sceneObject.Name, sceneObject.UUID);
199 } 199 }
200 } 200 }
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes
205 foreach (TaskInventoryItem tii in taskDictionary.Values) 205 foreach (TaskInventoryItem tii in taskDictionary.Values)
206 { 206 {
207 // m_log.DebugFormat( 207 // m_log.DebugFormat(
208 // "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}", 208 // "[ARCHIVER]: Analysing item {0} asset type {1} in {2} {3}",
209 // tii.Name, tii.Type, part.Name, part.UUID); 209 // tii.Name, tii.Type, part.Name, part.UUID);
210 210
211 if (!GatheredUuids.ContainsKey(tii.AssetID)) 211 if (!GatheredUuids.ContainsKey(tii.AssetID))
@@ -214,19 +214,19 @@ namespace OpenSim.Region.Framework.Scenes
214 214
215 // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed 215 // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
216 // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and 216 // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
217 // inventory transfer. There needs to be a way for a module to register a method without assuming a 217 // inventory transfer. There needs to be a way for a module to register a method without assuming a
218 // Scene.EventManager is present. 218 // Scene.EventManager is present.
219 // part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids); 219 // part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
220 220
221 221
222 // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs 222 // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs
223 RecordMaterialsUuids(part); 223 RecordMaterialsUuids(part);
224 } 224 }
225 catch (Exception e) 225 catch (Exception e)
226 { 226 {
227 m_log.ErrorFormat("[UUID GATHERER]: Failed to get part - {0}", e); 227 m_log.ErrorFormat("[UUID GATHERER]: Failed to get part - {0}", e);
228 m_log.DebugFormat( 228 m_log.DebugFormat(
229 "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)", 229 "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)",
230 part.Shape.TextureEntry.Length); 230 part.Shape.TextureEntry.Length);
231 } 231 }
232 } 232 }
@@ -283,7 +283,7 @@ namespace OpenSim.Region.Framework.Scenes
283 return; 283 return;
284 284
285 try 285 try
286 { 286 {
287 AssetBase assetBase = GetAsset(assetUuid); 287 AssetBase assetBase = GetAsset(assetUuid);
288 288
289 if (null != assetBase) 289 if (null != assetBase)
@@ -322,14 +322,14 @@ namespace OpenSim.Region.Framework.Scenes
322 m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset id {0}", assetUuid); 322 m_log.ErrorFormat("[UUID GATHERER]: Failed to gather uuids for asset id {0}", assetUuid);
323 throw; 323 throw;
324 } 324 }
325 } 325 }
326 326
327 private void AddForInspection(UUID assetUuid, sbyte assetType) 327 private void AddForInspection(UUID assetUuid, sbyte assetType)
328 { 328 {
329 // Here, we want to collect uuids which require further asset fetches but mark the others as gathered 329 // Here, we want to collect uuids which require further asset fetches but mark the others as gathered
330 try 330 try
331 { 331 {
332 if ((sbyte)AssetType.Bodypart == assetType 332 if ((sbyte)AssetType.Bodypart == assetType
333 || (sbyte)AssetType.Clothing == assetType 333 || (sbyte)AssetType.Clothing == assetType
334 || (sbyte)AssetType.Gesture == assetType 334 || (sbyte)AssetType.Gesture == assetType
335 || (sbyte)AssetType.Notecard == assetType 335 || (sbyte)AssetType.Notecard == assetType
@@ -347,7 +347,7 @@ namespace OpenSim.Region.Framework.Scenes
347 catch (Exception) 347 catch (Exception)
348 { 348 {
349 m_log.ErrorFormat( 349 m_log.ErrorFormat(
350 "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}", 350 "[UUID GATHERER]: Failed to gather uuids for asset id {0}, type {1}",
351 assetUuid, assetType); 351 assetUuid, assetType);
352 throw; 352 throw;
353 } 353 }
@@ -511,7 +511,7 @@ namespace OpenSim.Region.Framework.Scenes
511 /// </summary> 511 /// </summary>
512 /// <param name="gestureAsset"></param> 512 /// <param name="gestureAsset"></param>
513 private void RecordGestureAssetUuids(AssetBase gestureAsset) 513 private void RecordGestureAssetUuids(AssetBase gestureAsset)
514 { 514 {
515 using (MemoryStream ms = new MemoryStream(gestureAsset.Data)) 515 using (MemoryStream ms = new MemoryStream(gestureAsset.Data))
516 using (StreamReader sr = new StreamReader(ms)) 516 using (StreamReader sr = new StreamReader(ms))
517 { 517 {