Fix a few merge issues

5 files changed, 12 insertions, 10 deletions

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index e47c842228..45abb695cb 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -279,7 +279,7 @@ bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read)
             GLuint64 samples_passed = 0;
             glGetQueryObjectui64v(mSamplesQuery, GL_QUERY_RESULT, &samples_passed);
 
-            U64 primitives_generated = 0;
+            GLuint64 primitives_generated = 0;
             glGetQueryObjectui64v(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated);
             sTotalTimeElapsed += time_elapsed;
 
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 52062a3ad2..0e8e64af69 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1253,10 +1253,10 @@ bool LLFace::getGeometryVolume(const LLVolume& volume,
     {
         color = tep->getColor();
 
-    if (tep->getGLTFRenderMaterial())
-    {
-        color = tep->getGLTFRenderMaterial()->mBaseColor;
-    }
+        if (tep->getGLTFRenderMaterial())
+        {
+            color = tep->getGLTFRenderMaterial()->mBaseColor;
+        }
     }
 
     if (rebuild_color)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 226c32c396..89af765bb7 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1805,7 +1805,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                     getChild<LLUICtrl>("shinyOffsetV")->setValue(offset_y);
                     getChild<LLUICtrl>("glossiness")->setValue(material->getSpecularLightExponent());
                     getChild<LLUICtrl>("environment")->setValue(material->getEnvironmentIntensity());
-                    getChild<LLUICtrl>("mirror")->setValue(material->getEnvironmentIntensity());
 
                     updateShinyControls(!material->getSpecularID().isNull(), true);
                 }
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 284fff4d8c..81a70a81cf 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -2243,8 +2243,11 @@ void LLTextureCtrl::draw()
             }
             else
             {
-                preview = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-                preview->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
+                mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+                mTexturep->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
+                mTexturep->forceToSaveRawImage(0);
+
+                preview = mTexturep;
             }
         }
     }
diff --git a/indra/newview/lltinygltfhelper.cpp b/indra/newview/lltinygltfhelper.cpp
index 7508956fd5..168708ca37 100644
--- a/indra/newview/lltinygltfhelper.cpp
+++ b/indra/newview/lltinygltfhelper.cpp
@@ -91,14 +91,14 @@ void LLTinyGLTFHelper::initFetchedTextures(tinygltf::Material& material,
         {
             if (material.pbrMetallicRoughness.metallicRoughnessTexture.index != material.occlusionTexture.index)
             {
-                LLImageDataLock lockIn(occlusion_img);
-                LLImageDataLock lockOut(mr_img);
                 // occlusion is a distinct texture from pbrMetallicRoughness
                 // pack into mr red channel
                 int occlusion_idx = material.occlusionTexture.index;
                 int mr_idx = material.pbrMetallicRoughness.metallicRoughnessTexture.index;
                 if (occlusion_idx != mr_idx)
                 {
+                    LLImageDataLock lockIn(occlusion_img);
+                    LLImageDataLock lockOut(mr_img);
                     //scale occlusion image to match resolution of mr image
                     occlusion_img->scale(mr_img->getWidth(), mr_img->getHeight());