Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp
index 8e498158d6..810b648f17 100644
--- a/indra/llprimitive/llgltfloader.cpp
+++ b/indra/llprimitive/llgltfloader.cpp
@@ -59,11 +59,11 @@
 
 static const std::string lod_suffix[LLModel::NUM_LODS] =
 {
-	"_LOD0",
-	"_LOD1",
-	"_LOD2",
-	"",
-	"_PHYS",
+    "_LOD0",
+    "_LOD1",
+    "_LOD2",
+    "",
+    "_PHYS",
 };
 
 
@@ -142,13 +142,13 @@ bool LLGLTFLoader::parseMeshes()
 
     // 2022-04 DJH Volume params from dae example. TODO understand PCODE
     LLVolumeParams volume_params;
-    volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE);    
-    
+    volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE);
+
     for (tinygltf::Mesh mesh : mGltfModel.meshes)
     {
         LLModel *pModel = new LLModel(volume_params, 0.f);
 
-        if (populateModelFromMesh(pModel, mesh)         && 
+        if (populateModelFromMesh(pModel, mesh)         &&
             (LLModel::NO_ERRORS == pModel->getStatus()) &&
             validate_model(pModel))
         {
@@ -179,7 +179,7 @@ bool LLGLTFLoader::populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &
         if (pos_idx >= 0)
         {
             positions_a = mGltfModel.accessors[pos_idx];
-            if (TINYGLTF_COMPONENT_TYPE_FLOAT != positions_a.componentType) 
+            if (TINYGLTF_COMPONENT_TYPE_FLOAT != positions_a.componentType)
                 continue;
             auto positions_bv = mGltfModel.bufferViews[positions_a.bufferView];
             auto positions_buf = mGltfModel.buffers[positions_bv.buffer];
@@ -202,12 +202,12 @@ bool LLGLTFLoader::populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &
             //auto pos = mesh.    TODO resume here DJH 2022-04
         }
     }
-    
+
     //pModel->addFace()
     return false;
 }
 
-bool LLGLTFLoader::parseMaterials() 
+bool LLGLTFLoader::parseMaterials()
 {
     if (!mGltfLoaded) return false;
 
@@ -241,7 +241,7 @@ bool LLGLTFLoader::parseMaterials()
             LL_WARNS("GLTF_IMPORT") << "Unsupported image encoding" << LL_ENDL;
             return false;
         }
-        
+
         if (image.size != image.height * image.width * image.numChannels * image.bytesPerChannel)
         {
             LL_WARNS("GLTF_IMPORT") << "Image size error" << LL_ENDL;
@@ -329,7 +329,7 @@ bool LLGLTFLoader::parseMaterials()
         mMaterials.push_back(mat);
     }
 
-    return true; 
+    return true;
 }
 
 // TODO: convert raw vertex buffers to UUIDs
@@ -346,7 +346,7 @@ void LLGLTFLoader::uploadMaterials()
         if (mat.hasBaseTex)
         {
             gltf_texture& gtex = mTextures[mat.baseColorTexIdx];
-            if (gtex.imageUuid.isNull()) 
+            if (gtex.imageUuid.isNull())
             {
                 gtex.imageUuid = imageBufferToTextureUUID(gtex);
             }