From 0fe39a1f3f64c336ccbf806e89b62d158d1da110 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Thu, 23 Jun 2022 18:07:10 -0700
Subject: Correcting windows specific filesystem issues and removing unused DAE
 code in llgltfloader.cpp from SL-17214

---
 indra/llprimitive/llgltfloader.cpp | 6 ++----
 indra/llprimitive/llgltfloader.h   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra')

diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp
index 3ec11f70c6..6041c9c273 100644
--- a/indra/llprimitive/llgltfloader.cpp
+++ b/indra/llprimitive/llgltfloader.cpp
@@ -24,7 +24,7 @@
  * $/LicenseInfo$
  */
 
-#include "LLGLTFLoader.h"
+#include "llgltfloader.h"
 
 // Import & define single-header gltf import/export lib
 #define TINYGLTF_IMPLEMENTATION
@@ -43,7 +43,7 @@
 // Additionally, disable inclusion of STB header files entirely with
 // TINYGLTF_NO_INCLUDE_STB_IMAGE
 // TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE
-#include "tinygltf\tiny_gltf.h"
+#include "tinygltf/tiny_gltf.h"
 
 
 // TODO: includes inherited from dae loader.  Validate / prune
@@ -68,7 +68,6 @@ static const std::string lod_suffix[LLModel::NUM_LODS] =
 	"_PHYS",
 };
 
-const U32 LIMIT_MATERIALS_OUTPUT = 12;
 
 LLGLTFLoader::LLGLTFLoader(std::string filename,
     S32                                 lod,
@@ -94,7 +93,6 @@ LLGLTFLoader::LLGLTFLoader(std::string filename,
                      jointsFromNodes,
                      jointAliasMap,
                      maxJointsPerMesh ),
-    mGeneratedModelLimit(modelLimit),
     //mPreprocessGLTF(preprocess),
     mMeshesLoaded(false),
     mMaterialsLoaded(false)
diff --git a/indra/llprimitive/llgltfloader.h b/indra/llprimitive/llgltfloader.h
index 91389b5845..b4d6ca1940 100644
--- a/indra/llprimitive/llgltfloader.h
+++ b/indra/llprimitive/llgltfloader.h
@@ -158,7 +158,6 @@ private:
     bool populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &mesh);
     LLUUID imageBufferToTextureUUID(const gltf_texture& tex);
 
-    U32  mGeneratedModelLimit;  // Attempt to limit amount of generated submodels
     //    bool mPreprocessGLTF;
 
     /*  Below inherited from dae loader - unknown if/how useful here
-- 
cgit v1.2.3