9 files changed, 14 insertions, 14 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index ff0cad58d6..e8a0601852 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -79,6 +79,8 @@ else()
         )
 endif ()
 
+include(LibraryInstall)
+
 #add unit tests
 if (LL_TESTS)
     INCLUDE(LLAddBuildTest)
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index 0335011a56..82eb76c8e9 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -29,6 +29,7 @@
 
 #include "llmodelloader.h"
 
+#if 0
 class DAE;
 class daeElement;
 class domProfile_COMMON;
@@ -38,6 +39,7 @@ class domTranslate;
 class domController;
 class domSkin;
 class domMesh;
+#endif
 
 class LLDAELoader : public LLModelLoader
 {
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index 8d45cb6185..6bb021254b 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -36,6 +36,7 @@
 
 #include <array>
 #include <string>
+#include <array>
 #include <map>
 
 namespace tinygltf
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 8055bffd32..db752411fc 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -33,7 +33,7 @@
 #include "llvector4a.h"
 #include "hbxxh.h"
 
-#ifdef LL_USESYSTEMLIBS
+#if 1
 # include <zlib.h>
 #else
 # include "zlib-ng/zlib.h"
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index ac88af18f0..854c77e63a 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -35,8 +35,10 @@
 
 #include <boost/align/aligned_allocator.hpp>
 
+#if 0
 class daeElement;
 class domMesh;
+#endif
 
 #define MAX_MODEL_FACES 8
 
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index 0383659f62..6ff62bc282 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -59,7 +59,7 @@ static void stretch_extents(const LLModel* model, const LLMatrix4a& mat, LLVecto
         center.setAdd(face.mExtents[0], face.mExtents[1]);
         center.mul(0.5f);
         LLVector4a size;
-        size.setSub(face.mExtents[1],face.mExtents[0]);
+        size.setSub(face.mExtents[1], face.mExtents[0]);
         size.mul(0.5f);
 
         for (U32 i = 0; i < 8; i++)
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index c5d6076b98..c116f69a6d 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -274,7 +274,7 @@ void  LLPrimitive::setAllTETextures(const LLUUID &tex_id)
 //===============================================================
 void LLPrimitive::setTE(const U8 index, const LLTextureEntry& te)
 {
-    if(mTextureList.copyTexture(index, te) != TEM_CHANGE_NONE && te.getBumpmap() > 0)
+    if(mTextureList.copyTexture(index, &te) != TEM_CHANGE_NONE && te.getBumpmap() > 0)
     {
         mNumBumpmapTEs++;
     }
@@ -753,7 +753,7 @@ void LLPrimitive::copyTEs(const LLPrimitive *primitivep)
     }
     for (i = 0; i < num_tes; i++)
     {
-        mTextureList.copyTexture(i, *(primitivep->getTE(i)));
+        mTextureList.copyTexture(i, primitivep->getTE(i));
     }
 }
 
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index 68f3f5ffac..7f60d8025a 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -125,7 +125,7 @@ void LLPrimTextureList::take(LLPrimTextureList& other_list)
 // virtual
 // copies LLTextureEntry 'te'
 // returns TEM_CHANGE_TEXTURE if successful, otherwise TEM_CHANGE_NONE
-S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te)
+S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry* te)
 {
     if (size_t(index) >= mEntryList.size())
     {
@@ -137,14 +137,7 @@ S32 LLPrimTextureList::copyTexture(const U8 index, const LLTextureEntry& te)
         // we're changing an existing entry
     llassert(mEntryList[index]);
     delete (mEntryList[index]);
-    if  (&te)
-    {
-        mEntryList[index] = te.newCopy();
-    }
-    else
-    {
-        mEntryList[index] = LLPrimTextureList::newTextureEntry();
-    }
+    mEntryList[index] = te->newCopy();
     return TEM_CHANGE_TEXTURE;
 }
 
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h
index 79744e9f08..b8bdad60b3 100644
--- a/indra/llprimitive/llprimtexturelist.h
+++ b/indra/llprimitive/llprimtexturelist.h
@@ -71,7 +71,7 @@ public:
 
     // copies LLTextureEntry 'te'
     // returns TEM_CHANGE_TEXTURE if successful, otherwise TEM_CHANGE_NONE
-    S32 copyTexture(const U8 index, const LLTextureEntry& te);
+    S32 copyTexture(const U8 index, const LLTextureEntry* te);
 
     // takes ownership of LLTextureEntry* 'te'
     // returns TEM_CHANGE_TEXTURE if successful, otherwise TEM_CHANGE_NONE