From 4f96158ac39b2bb333fd28907e134df9960790ed Mon Sep 17 00:00:00 2001 From: Christopher Date: Sun, 28 Jun 2020 15:23:10 +0200 Subject: [PATCH] use foreach to get textures --- src/TextureFetcher.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/TextureFetcher.cs b/src/TextureFetcher.cs index 1ed015d..136a7cc 100644 --- a/src/TextureFetcher.cs +++ b/src/TextureFetcher.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; +using static OpenMetaverse.Primitive; [assembly: Addin("TextureFetcher", "0.1")] [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] @@ -128,22 +129,18 @@ namespace OpenSim.Modules.TextureFetcher Primitive.TextureEntry textures = part.Shape.Textures; int allSides = part.GetNumberOfSides(); - for (uint i = 0; i <= allSides; i++) + foreach(TextureEntryFace face in textures.FaceTextures) { - m_log.Info("[" + Name + "] Get face " + i); - if (textures.FaceTextures[i] != null) + if(face != null) { - if (textures.FaceTextures[i].TextureID != null) - allTextures.Add(textures.FaceTextures[i].TextureID); + if (face.TextureID != null) + allTextures.Add(face.TextureID); - if (textures.FaceTextures[i].MaterialID != null) - allTextures.Add(textures.FaceTextures[i].MaterialID); + if (face.MaterialID != null) + allTextures.Add(face.MaterialID); } } - if (part.Shape.SculptTexture != UUID.Zero) - allTextures.Add(part.Shape.SculptTexture); - //Convert texture uuid list to inventar items. foreach (UUID texture in allTextures) {