Merge pull request #5659 from secondlife/marchcat/slua-26.1.1

Update SLua PV to 26.1.1

3 files changed, 51 insertions, 2 deletions

diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp
index 187876e3b8..c170672859 100644
--- a/indra/newview/gltf/asset.cpp
+++ b/indra/newview/gltf/asset.cpp
@@ -1027,6 +1027,12 @@ bool Image::prepImpl(Asset& asset, const LLUUID& id)
         std::string dir = gDirUtilp->getDirName(asset.mFilename);
         std::string img_file = dir + gDirUtilp->getDirDelimiter() + mUri;
 
+        if (!gDirUtilp->fileExists(img_file))
+        {
+            // URI might be escaped, unescape.
+            img_file = dir + gDirUtilp->getDirDelimiter() + LLURI::unescape(mUri);
+        }
+
         LLUUID tracking_id = LLLocalBitmapMgr::getInstance()->addUnit(img_file);
         if (tracking_id.notNull() && mLoadIntoTexturePipe)
         {
diff --git a/indra/newview/gltf/buffer_util.h b/indra/newview/gltf/buffer_util.h
index c231443a9e..53dee98cd1 100644
--- a/indra/newview/gltf/buffer_util.h
+++ b/indra/newview/gltf/buffer_util.h
@@ -141,6 +141,42 @@ namespace LL
         }
 
         template<>
+        inline void copyScalar<U32, LLVector4a>(U32* src, LLVector4a& dst)
+        {
+            dst.set((F32)*src, 0.f, 0.f, 0.f);
+        }
+
+        template<>
+        inline void copyScalar<U16, LLVector4a>(U16* src, LLVector4a& dst)
+        {
+            dst.set((F32)*src, 0.f, 0.f, 0.f);
+        }
+
+        template<>
+        inline void copyScalar<U8, LLVector4a>(U8* src, LLVector4a& dst)
+        {
+            dst.set((F32)*src, 0.f, 0.f, 0.f);
+        }
+
+        template<>
+        inline void copyScalar<U32, LLVector2>(U32* src, LLVector2& dst)
+        {
+            dst.set((F32)*src, 0.f);
+        }
+
+        template<>
+        inline void copyScalar<U16, LLVector2>(U16* src, LLVector2& dst)
+        {
+            dst.set((F32)*src, 0.f);
+        }
+
+        template<>
+        inline void copyScalar<U8, LLVector2>(U8* src, LLVector2& dst)
+        {
+            dst.set((F32)*src, 0.f);
+        }
+
+        template<>
         inline void copyVec2<F32, LLVector2>(F32* src, LLVector2& dst)
         {
             dst.set(src[0], src[1]);
@@ -221,6 +257,12 @@ namespace LL
         }
 
         template<>
+        inline void copyVec4<U32, LLVector4a>(U32* src, LLVector4a& dst)
+        {
+            dst.set((F32)src[0], (F32)src[1], (F32)src[2], (F32)src[3]);
+        }
+
+        template<>
         inline void copyVec4<U16, LLVector4a>(U16* src, LLVector4a& dst)
         {
             dst.set(src[0], src[1], src[2], src[3]);
@@ -373,7 +415,7 @@ namespace LL
             }
             else
             {
-                LL_ERRS("GLTF") << "Unsupported accessor type" << LL_ENDL;
+                LL_ERRS("GLTF") << "Unsupported accessor type " << (S32)accessor.mType << LL_ENDL;
             }
         }
 
diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index 1af98c3730..66aa29d86b 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -826,7 +826,8 @@ bool LLGLTFLoader::populateModelFromMesh(LLModel* pModel, const std::string& bas
                 LL_DEBUGS("GLTF_IMPORT") << "No normals found for primitive, using default normal." << LL_ENDL;
             }
 
-            vert.uv0 = glm::vec2(prim.mTexCoords0[i][0], -prim.mTexCoords0[i][1]);
+            // Flip texture V coordinate
+            vert.uv0 = glm::vec2(prim.mTexCoords0[i][0], 1.f - prim.mTexCoords0[i][1]);
 
             if (skinIdx >= 0)
             {