Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

28 files changed, 567 insertions, 233 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 712b917b16..9c71fa4306 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1005,65 +1005,17 @@
         <string>glext</string>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>c5e9a59c7cf03c88a5cb4ab0a9c21091</string>
-              <key>url</key>
-              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/99835/880141/glext-68-darwin64-571812.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>baf1fd13e1fe6aef586200fc87a70f53</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-glext/rev/314200/arch/Linux/installer/glext-68-linux-314200.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>5f3c9d61b620f949b199ebd8885218ed</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-glext/rev/314200/arch/Linux/installer/glext-68-linux64-314200.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux64</string>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>6a311615bce59b01cf73ee65012a9b38</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54951/511711/glext-68-windows-538965.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
-          <key>windows64</key>
+          <key>common</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>daf619dab1cf7518af6532b18800c4b0</string>
+              <string>4f8dc85863fec36e8d872c31f4abcd05</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54924/511490/glext-68-windows64-538965.tar.bz2</string>
+              <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/101480/892402/glext-68-common-572829.tar.bz2</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>common</string>
           </map>
         </map>
         <key>version</key>
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index 9fd3923bfd..a749644202 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -2,9 +2,7 @@
 include(Prebuilt)
 
 if (NOT USESYSTEMLIBS)
-  if (WINDOWS OR LINUX)
-    use_prebuilt_binary(glext)
-  endif (WINDOWS OR LINUX)
+  use_prebuilt_binary(glext)
   use_prebuilt_binary(glh_linear)
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (NOT USESYSTEMLIBS)
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 868922451f..2d9d3725ad 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -3,10 +3,12 @@
 include(Variables)
 include(FreeType)
 include(GLH)
+include(GLEXT)
 
 set(LLRENDER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llrender
     ${GLH_INCLUDE_DIR}
+    ${GLEXT_INCLUDE_DIR}
     )
 
 if (BUILD_HEADLESS)
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 0bb1f1a0fd..f08cc18036 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -96,7 +96,7 @@ LLAssetDictionary::LLAssetDictionary()
 	addEntry(LLAssetType::AT_WIDGET,            new AssetEntry("WIDGET",            "widget",   "widget",           false,      false,      false));
 	addEntry(LLAssetType::AT_PERSON,            new AssetEntry("PERSON",            "person",   "person",           false,      false,      false));
 	addEntry(LLAssetType::AT_SETTINGS,          new AssetEntry("SETTINGS",          "settings", "settings blob",    true,       true,       true));
-	addEntry(LLAssetType::AT_MATERIAL,     new AssetEntry("MATERIAL",          "material", "render material",  true,       true,       true));
+	addEntry(LLAssetType::AT_MATERIAL,          new AssetEntry("MATERIAL",          "material", "render material",  true,       true,       true));
 	addEntry(LLAssetType::AT_UNKNOWN,           new AssetEntry("UNKNOWN",           "invalid",  NULL,               false,      false,      false));
     addEntry(LLAssetType::AT_NONE,              new AssetEntry("NONE",              "-1",		NULL,		  		FALSE,		FALSE,		FALSE));
 
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index 57d521429c..ceda2f3caf 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -86,6 +86,7 @@ LLInventoryDictionary::LLInventoryDictionary()
 	addEntry(LLInventoryType::IT_WIDGET,              new InventoryEntry("widget",    "widget",        1, LLAssetType::AT_WIDGET));
 	addEntry(LLInventoryType::IT_PERSON,              new InventoryEntry("person",    "person",        1, LLAssetType::AT_PERSON));
     addEntry(LLInventoryType::IT_SETTINGS,            new InventoryEntry("settings",  "settings",      1, LLAssetType::AT_SETTINGS));
+	addEntry(LLInventoryType::IT_MATERIAL,            new InventoryEntry("material",  "render material", 1, LLAssetType::AT_MATERIAL));
 }
 
 
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
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 1a9203ef02..7b1ed62dc9 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -455,6 +455,7 @@ LLGLManager::LLGLManager() :
 	mHasAnisotropic(FALSE),
 	mHasARBEnvCombine(FALSE),
 	mHasCubeMap(FALSE),
+	mHasCubeMapArray(FALSE),
 	mHasDebugOutput(FALSE),
 
 	mIsAMD(FALSE),
@@ -1069,6 +1070,7 @@ void LLGLManager::initExtensions()
 	mHasDebugOutput = ExtensionExists("GL_ARB_debug_output", gGLHExts.mSysExts);
 	mHasTransformFeedback = mGLVersion >= 4.f ? TRUE : FALSE;
     mHasUniformBufferObject = ExtensionExists("GL_ARB_uniform_buffer_object", gGLHExts.mSysExts);
+    mHasCubeMapArray = ExtensionExists("GL_ARB_texture_cube_map_array", gGLHExts.mSysExts);
 #if !LL_DARWIN
 	mHasPointParameters = ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
@@ -1181,6 +1183,10 @@ void LLGLManager::initExtensions()
 	{
 		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_draw_buffers" << LL_ENDL;
 	}
+	if (!mHasCubeMapArray)
+	{
+		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_cube_map_array" << LL_ENDL;
+	}
 
 	// Disable certain things due to known bugs
 	if (mIsIntel && mHasMipMapGeneration)
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index eea53ed01e..cd0b247ed8 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -114,6 +114,7 @@ public:
 	BOOL mHasAnisotropic;
 	BOOL mHasARBEnvCombine;
 	BOOL mHasCubeMap;
+	BOOL mHasCubeMapArray;
 	BOOL mHasDebugOutput;
 	BOOL mHassRGBTexture;
 	BOOL mHassRGBFramebuffer;
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index c53631dc7b..154f1aa2bd 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -577,11 +577,13 @@ extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
 //----------------------------------------------------------------------------
 // LL_DARWIN
 
+#define GL_GLEXT_LEGACY
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 
 #define GL_EXT_separate_specular_color 1
-#include <OpenGL/glext.h>
+#define GL_GLEXT_PROTOTYPES
+#include "GL/glext.h"
 
 #include "GL/glh_extensions.h"
 
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 0212c605c3..67f82c9c5e 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -452,7 +452,7 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
 #ifdef GL_INTERLEAVED_ATTRIBS
     if (varying_count > 0 && varyings)
     {
-        glTransformFeedbackVaryings(mProgramObject, varying_count, varyings, GL_INTERLEAVED_ATTRIBS);
+        glTransformFeedbackVaryings((GLuint64) mProgramObject, varying_count, varyings, GL_INTERLEAVED_ATTRIBS);
     }
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl
index 8c1323ba1a..ab5badf538 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl
@@ -473,4 +473,5 @@ void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 no
     fresnel = min(fresnel+envIntensity, 1.0);
     reflected_color *= (envIntensity*fresnel)*brighten(spec.rgb);
     color = mix(color.rgb, reflected_color, envIntensity);
- }
\ No newline at end of file
+ }
+
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 707ff2b7b6..f7dc493109 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -1306,6 +1306,18 @@ const std::string& LLInventoryFilter::getFilterText()
 		filtered_by_all_types = FALSE;
 	}
 
+	if (isFilterObjectTypesWith(LLInventoryType::IT_MATERIAL))
+	{
+		filtered_types +=  LLTrans::getString("Materials");
+		filtered_by_type = TRUE;
+		num_filter_types++;
+	}
+	else
+	{
+		not_filtered_types +=  LLTrans::getString("Materials");
+		filtered_by_all_types = FALSE;
+	}
+
 	if (isFilterObjectTypesWith(LLInventoryType::IT_NOTECARD))
 	{
 		filtered_types +=  LLTrans::getString("Notecards");
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp
index 44e493fdf4..e9b0e8404a 100644
--- a/indra/newview/llinventoryicon.cpp
+++ b/indra/newview/llinventoryicon.cpp
@@ -99,6 +99,8 @@ LLIconDictionary::LLIconDictionary()
     addEntry(LLInventoryType::ICONNAME_SETTINGS_DAY,            new IconEntry("Inv_SettingsDay"));
     addEntry(LLInventoryType::ICONNAME_SETTINGS,                new IconEntry("Inv_Settings"));
 
+    addEntry(LLInventoryType::ICONNAME_MATERIAL,                new IconEntry("Inv_Material"));
+
 	addEntry(LLInventoryType::ICONNAME_INVALID, 				new IconEntry("Inv_Invalid"));
 	addEntry(LLInventoryType::ICONNAME_UNKNOWN, 				new IconEntry("Inv_Unknown"));
 
@@ -177,6 +179,9 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
 		case LLAssetType::AT_SETTINGS:
 			idx = assignSettingsIcon(misc_flag);
 			break;
+		case LLAssetType::AT_MATERIAL:
+			idx = LLInventoryType::ICONNAME_MATERIAL;
+			break;
 		case LLAssetType::AT_UNKNOWN:
 			idx = LLInventoryType::ICONNAME_UNKNOWN;
 		default:
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index e2dce10662..3c9d722b87 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -27,9 +27,13 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llmaterialeditor.h"
+
+#include "llappviewer.h"
 #include "llcombobox.h"
+#include "llnotificationsutil.h"
+#include "lltexturectrl.h"
+#include "lltrans.h"
 #include "llviewermenufile.h"
-#include "llappviewer.h"
 #include "llviewertexture.h"
 #include "llselectmgr.h"
 #include "llvovolume.h"
@@ -48,18 +52,41 @@ LLMaterialEditor::LLMaterialEditor(const LLSD& key)
 
 BOOL LLMaterialEditor::postBuild()
 {
+    mAlbedoTextureCtrl = getChild<LLTextureCtrl>("albedo_texture");
+    mMetallicTextureCtrl = getChild<LLTextureCtrl>("metallic_roughness_texture");
+    mEmissiveTextureCtrl = getChild<LLTextureCtrl>("emissive_texture");
+    mNormalTextureCtrl = getChild<LLTextureCtrl>("normal_texture");
+
+    mAlbedoTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitAlbedoTexture, this, _1, _2));
+    mMetallicTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitMetallicTexture, this, _1, _2));
+    mEmissiveTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitEmissiveTexture, this, _1, _2));
+    mNormalTextureCtrl->setCommitCallback(boost::bind(&LLMaterialEditor::onCommitNormalTexture, this, _1, _2));
+
     childSetAction("save", boost::bind(&LLMaterialEditor::onClickSave, this));
+    childSetAction("save_as", boost::bind(&LLMaterialEditor::onClickSaveAs, this));
+    childSetAction("cancel", boost::bind(&LLMaterialEditor::onClickCancel, this));
+
 	return LLFloater::postBuild();
 }
 
 LLUUID LLMaterialEditor::getAlbedoId()
 {
-    return childGetValue("albedo texture").asUUID();
+    return mAlbedoTextureCtrl->getValue().asUUID();
 }
 
 void LLMaterialEditor::setAlbedoId(const LLUUID& id)
 {
-    childSetValue("albedo texture", id);
+    mAlbedoTextureCtrl->setValue(id);
+    mAlbedoTextureCtrl->setDefaultImageAssetID(id);
+
+    if (id.notNull())
+    {
+        // todo: this does not account for posibility of texture
+        // being from inventory, need to check that
+        childSetValue("albedo_upload_fee", getString("upload_fee_string"));
+        // Only set if we will need to upload this texture
+        mAlbedoTextureUploadId = id;
+    }
 }
 
 LLColor4 LLMaterialEditor::getAlbedoColor()
@@ -69,7 +96,6 @@ LLColor4 LLMaterialEditor::getAlbedoColor()
     return ret;
 }
 
-
 void LLMaterialEditor::setAlbedoColor(const LLColor4& color)
 {
     childSetValue("albedo color", color.getValue());
@@ -101,14 +127,29 @@ void LLMaterialEditor::setAlphaCutoff(F32 alpha_cutoff)
     childSetValue("alpha cutoff", alpha_cutoff);
 }
 
+void LLMaterialEditor::setMaterialName(const std::string &name)
+{
+    setTitle(name);
+    mMaterialName = name;
+}
+
 LLUUID LLMaterialEditor::getMetallicRoughnessId()
 {
-    return childGetValue("metallic-roughness texture").asUUID();
+    return mMetallicTextureCtrl->getValue().asUUID();
 }
 
 void LLMaterialEditor::setMetallicRoughnessId(const LLUUID& id)
 {
-    childSetValue("metallic-roughness texture", id);
+    mMetallicTextureCtrl->setValue(id);
+    mMetallicTextureCtrl->setDefaultImageAssetID(id);
+
+    if (id.notNull())
+    {
+        // todo: this does not account for posibility of texture
+        // being from inventory, need to check that
+        childSetValue("metallic_upload_fee", getString("upload_fee_string"));
+        mMetallicTextureUploadId = id;
+    }
 }
 
 F32 LLMaterialEditor::getMetalnessFactor()
@@ -133,12 +174,21 @@ void LLMaterialEditor::setRoughnessFactor(F32 factor)
 
 LLUUID LLMaterialEditor::getEmissiveId()
 {
-    return childGetValue("emissive texture").asUUID();
+    return mEmissiveTextureCtrl->getValue().asUUID();
 }
 
 void LLMaterialEditor::setEmissiveId(const LLUUID& id)
 {
-    childSetValue("emissive texture", id);
+    mEmissiveTextureCtrl->setValue(id);
+    mEmissiveTextureCtrl->setDefaultImageAssetID(id);
+
+    if (id.notNull())
+    {
+        // todo: this does not account for posibility of texture
+        // being from inventory, need to check that
+        childSetValue("emissive_upload_fee", getString("upload_fee_string"));
+        mEmissiveTextureUploadId = id;
+    }
 }
 
 LLColor4 LLMaterialEditor::getEmissiveColor()
@@ -153,12 +203,21 @@ void LLMaterialEditor::setEmissiveColor(const LLColor4& color)
 
 LLUUID LLMaterialEditor::getNormalId()
 {
-    return childGetValue("normal texture").asUUID();
+    return mNormalTextureCtrl->getValue().asUUID();
 }
 
 void LLMaterialEditor::setNormalId(const LLUUID& id)
 {
-    childSetValue("normal texture", id);
+    mNormalTextureCtrl->setValue(id);
+    mNormalTextureCtrl->setDefaultImageAssetID(id);
+
+    if (id.notNull())
+    {
+        // todo: this does not account for posibility of texture
+        // being from inventory, need to check that
+        childSetValue("normal_upload_fee", getString("upload_fee_string"));
+        mNormalTextureUploadId = id;
+    }
 }
 
 bool LLMaterialEditor::getDoubleSided()
@@ -171,6 +230,60 @@ void LLMaterialEditor::setDoubleSided(bool double_sided)
     childSetValue("double sided", double_sided);
 }
 
+void LLMaterialEditor::onCommitAlbedoTexture(LLUICtrl * ctrl, const LLSD & data)
+{
+    // might be better to use arrays, to have a single callback
+    // and not to repeat the same thing for each tecture controls
+    LLUUID new_val = mAlbedoTextureCtrl->getValue().asUUID();
+    if (new_val == mAlbedoTextureUploadId && mAlbedoTextureUploadId.notNull())
+    {
+        childSetValue("albedo_upload_fee", getString("upload_fee_string"));
+    }
+    else
+    {
+        childSetValue("albedo_upload_fee", getString("no_upload_fee_string"));
+    }
+}
+
+void LLMaterialEditor::onCommitMetallicTexture(LLUICtrl * ctrl, const LLSD & data)
+{
+    LLUUID new_val = mMetallicTextureCtrl->getValue().asUUID();
+    if (new_val == mMetallicTextureUploadId && mMetallicTextureUploadId.notNull())
+    {
+        childSetValue("metallic_upload_fee", getString("upload_fee_string"));
+    }
+    else
+    {
+        childSetValue("metallic_upload_fee", getString("no_upload_fee_string"));
+    }
+}
+
+void LLMaterialEditor::onCommitEmissiveTexture(LLUICtrl * ctrl, const LLSD & data)
+{
+    LLUUID new_val = mEmissiveTextureCtrl->getValue().asUUID();
+    if (new_val == mEmissiveTextureUploadId && mEmissiveTextureUploadId.notNull())
+    {
+        childSetValue("emissive_upload_fee", getString("upload_fee_string"));
+    }
+    else
+    {
+        childSetValue("emissive_upload_fee", getString("no_upload_fee_string"));
+    }
+}
+
+void LLMaterialEditor::onCommitNormalTexture(LLUICtrl * ctrl, const LLSD & data)
+{
+    LLUUID new_val = mNormalTextureCtrl->getValue().asUUID();
+    if (new_val == mNormalTextureUploadId && mNormalTextureUploadId.notNull())
+    {
+        childSetValue("normal_upload_fee", getString("upload_fee_string"));
+    }
+    else
+    {
+        childSetValue("normal_upload_fee", getString("no_upload_fee_string"));
+    }
+}
+
 
 static void write_color(const LLColor4& color, std::vector<double>& c)
 {
@@ -265,7 +378,40 @@ void LLMaterialEditor::onClickSave()
     
     std::string dump = str.str();
 
-    LL_INFOS() << dump << LL_ENDL;
+    LL_INFOS() << mMaterialName << ": " << dump << LL_ENDL;
+}
+
+void LLMaterialEditor::onClickSaveAs()
+{
+    LLSD args;
+    args["DESC"] = mMaterialName;
+
+    LLNotificationsUtil::add("SaveMaterialAs", args, LLSD(), boost::bind(&LLMaterialEditor::onSaveAsCommitCallback, this, _1, _2));
+}
+
+void LLMaterialEditor::onSaveAsCommitCallback(const LLSD& notification, const LLSD& response)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (0 == option)
+    {
+        std::string new_name = response["message"].asString();
+        LLStringUtil::trim(new_name);
+        if (!new_name.empty())
+        {
+            setMaterialName(new_name);
+            onClickSave();
+        }
+        else
+        {
+            LLNotificationsUtil::add("InvalidMaterialName");
+        }
+    }
+}
+
+void LLMaterialEditor::onClickCancel()
+{
+    // Todo: confirm usaved changes
+    closeFloater();
 }
 
 class LLMaterialFilePicker : public LLFilePickerThread
@@ -465,13 +611,14 @@ void LLMaterialFilePicker::loadMaterial(const std::string& filename)
 
     if (!loaded)
     {
-        // TODO: show error_msg to user
+        LLNotificationsUtil::add("CannotUploadMaterial");
         return;
     }
 
     if (model_in.materials.empty())
     {
-        // TODO: show error message that materials are missing
+        // materials are missing
+        LLNotificationsUtil::add("CannotUploadMaterial");
         return;
     }
 
@@ -548,9 +695,12 @@ void LLMaterialFilePicker::loadMaterial(const std::string& filename)
     
     mME->setMetalnessFactor(material_in.pbrMetallicRoughness.metallicFactor);
     mME->setRoughnessFactor(material_in.pbrMetallicRoughness.roughnessFactor);
-    
+
     mME->setDoubleSided(material_in.doubleSided);
 
+    std::string new_material = LLTrans::getString("New Material");
+    mME->setMaterialName(new_material);
+
     mME->openFloater();
 
     mME->applyToSelection();
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index e773ecd169..1584f2c136 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -28,6 +28,8 @@
 
 #include "llfloater.h"
 
+class LLTextureCtrl;
+
 class LLMaterialEditor : public LLFloater
 {
 public:
@@ -40,6 +42,9 @@ public:
     void applyToSelection();
 
     void onClickSave();
+    void onClickSaveAs();
+    void onSaveAsCommitCallback(const LLSD& notification, const LLSD& response);
+    void onClickCancel();
 
 	// llpanel
 	BOOL postBuild() override;
@@ -59,6 +64,8 @@ public:
 
     F32 getAlphaCutoff();
     void setAlphaCutoff(F32 alpha_cutoff);
+    
+    void setMaterialName(const std::string &name);
 
     LLUUID getMetallicRoughnessId();
     void setMetallicRoughnessId(const LLUUID& id);
@@ -80,5 +87,24 @@ public:
 
     bool getDoubleSided();
     void setDoubleSided(bool double_sided);
+
+    void onCommitAlbedoTexture(LLUICtrl* ctrl, const LLSD& data);
+    void onCommitMetallicTexture(LLUICtrl* ctrl, const LLSD& data);
+    void onCommitEmissiveTexture(LLUICtrl* ctrl, const LLSD& data);
+    void onCommitNormalTexture(LLUICtrl* ctrl, const LLSD& data);
+
+private:
+    LLTextureCtrl* mAlbedoTextureCtrl;
+    LLTextureCtrl* mMetallicTextureCtrl;
+    LLTextureCtrl* mEmissiveTextureCtrl;
+    LLTextureCtrl* mNormalTextureCtrl;
+
+    // 'Default' texture, unless it's null or from inventory is the one with the fee
+    LLUUID mAlbedoTextureUploadId;
+    LLUUID mMetallicTextureUploadId;
+    LLUUID mEmissiveTextureUploadId;
+    LLUUID mNormalTextureUploadId;
+
+    std::string mMaterialName;
 };
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 89256b40c4..49562da3f7 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -919,6 +919,7 @@ void LLFloaterInventoryFinder::updateElementsFromFilter()
 	getChild<LLUICtrl>("check_clothing")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_WEARABLE));
 	getChild<LLUICtrl>("check_gesture")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_GESTURE));
 	getChild<LLUICtrl>("check_landmark")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_LANDMARK));
+	getChild<LLUICtrl>("check_material")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_MATERIAL));
 	getChild<LLUICtrl>("check_notecard")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_NOTECARD));
 	getChild<LLUICtrl>("check_object")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_OBJECT));
 	getChild<LLUICtrl>("check_script")->setValue((S32) (filter_types & 0x1 << LLInventoryType::IT_LSL));
@@ -975,6 +976,12 @@ void LLFloaterInventoryFinder::draw()
 		filtered_by_all_types = FALSE;
 	}
 
+	if (!getChild<LLUICtrl>("check_material")->getValue())
+	{
+		filter &= ~(0x1 << LLInventoryType::IT_MATERIAL);
+		filtered_by_all_types = FALSE;
+	}
+
 	if (!getChild<LLUICtrl>("check_notecard")->getValue())
 	{
 		filter &= ~(0x1 << LLInventoryType::IT_NOTECARD);
@@ -1129,6 +1136,7 @@ void LLFloaterInventoryFinder::selectAllTypes(void* user_data)
 	self->getChild<LLUICtrl>("check_clothing")->setValue(TRUE);
 	self->getChild<LLUICtrl>("check_gesture")->setValue(TRUE);
 	self->getChild<LLUICtrl>("check_landmark")->setValue(TRUE);
+	self->getChild<LLUICtrl>("check_material")->setValue(TRUE);
 	self->getChild<LLUICtrl>("check_notecard")->setValue(TRUE);
 	self->getChild<LLUICtrl>("check_object")->setValue(TRUE);
 	self->getChild<LLUICtrl>("check_script")->setValue(TRUE);
@@ -1149,6 +1157,7 @@ void LLFloaterInventoryFinder::selectNoTypes(void* user_data)
 	self->getChild<LLUICtrl>("check_clothing")->setValue(FALSE);
 	self->getChild<LLUICtrl>("check_gesture")->setValue(FALSE);
 	self->getChild<LLUICtrl>("check_landmark")->setValue(FALSE);
+	self->getChild<LLUICtrl>("check_material")->setValue(FALSE);
 	self->getChild<LLUICtrl>("check_notecard")->setValue(FALSE);
 	self->getChild<LLUICtrl>("check_object")->setValue(FALSE);
 	self->getChild<LLUICtrl>("check_script")->setValue(FALSE);
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index bde8c0c51c..583c6de77b 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -109,12 +109,6 @@ void LLReflectionMapManager::update()
         }
     }
 
-    // =============== TODO -- move to an init function  =================
-
-    // naively drop probes every 16m as we move the camera around for now
-    // later, use LLSpatialPartition to manage probes
-    const F32 PROBE_SPACING = 16.f;
-    const U32 MAX_PROBES = 8;
 
     LLVector4a camera_pos;
     camera_pos.load3(LLViewerCamera::instance().getOrigin().mV);
@@ -122,7 +116,7 @@ void LLReflectionMapManager::update()
     // process kill list
     for (auto& probe : mKillList)
     {
-        auto& iter = std::find(mProbes.begin(), mProbes.end(), probe);
+        auto const & iter = std::find(mProbes.begin(), mProbes.end(), probe);
         if (iter != mProbes.end())
         {
             deleteProbe(iter - mProbes.begin());
@@ -143,7 +137,6 @@ void LLReflectionMapManager::update()
     {
         return;
     }
-    const F32 UPDATE_INTERVAL = 5.f;  //update no more than once every 5 seconds
 
     bool did_update = false;
 
@@ -366,7 +359,7 @@ void LLReflectionMapManager::deleteProbe(U32 i)
     // remove from any Neighbors lists
     for (auto& other : probe->mNeighbors)
     {
-        auto& iter = std::find(other->mNeighbors.begin(), other->mNeighbors.end(), probe);
+        auto const & iter = std::find(other->mNeighbors.begin(), other->mNeighbors.end(), probe);
         llassert(iter != other->mNeighbors.end());
         other->mNeighbors.erase(iter);
     }
@@ -599,7 +592,7 @@ void LLReflectionMapManager::updateNeighbors(LLReflectionMap* probe)
     
         for (auto& other : probe->mNeighbors)
         {
-            auto& iter = std::find(other->mNeighbors.begin(), other->mNeighbors.end(), probe);
+            auto const & iter = std::find(other->mNeighbors.begin(), other->mNeighbors.end(), probe);
             llassert(iter != other->mNeighbors.end()); // <--- bug davep if this ever happens, something broke badly
             other->mNeighbors.erase(iter);
         }
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 1c4a56b549..b761f34790 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -193,10 +193,8 @@ void LLFloaterTexturePicker::setActive( BOOL active )
 void LLFloaterTexturePicker::setCanApplyImmediately(BOOL b)
 {
 	mCanApplyImmediately = b;
-	if (!mCanApplyImmediately)
-	{
-		getChild<LLUICtrl>("apply_immediate_check")->setValue(FALSE);
-	}
+
+	getChild<LLUICtrl>("apply_immediate_check")->setValue(mCanApplyImmediately);
 	updateFilterPermMask();
 }
 
@@ -413,11 +411,7 @@ BOOL LLFloaterTexturePicker::postBuild()
 
 	getChild<LLUICtrl>("apply_immediate_check")->setValue(gSavedSettings.getBOOL("TextureLivePreview"));
 	childSetCommitCallback("apply_immediate_check", onApplyImmediateCheck, this);
-
-	if (!mCanApplyImmediately)
-	{
-		getChildView("show_folders_check")->setEnabled(FALSE);
-	}
+    getChildView("apply_immediate_check")->setEnabled(mCanApplyImmediately);
 
 	getChild<LLUICtrl>("Pipette")->setCommitCallback( boost::bind(&LLFloaterTexturePicker::onBtnPipette, this));
 	childSetAction("Cancel", LLFloaterTexturePicker::onBtnCancel,this);
@@ -483,7 +477,7 @@ void LLFloaterTexturePicker::draw()
 		}
 
 		getChildView("Default")->setEnabled(mImageAssetID != mDefaultImageAssetID || mTentative);
-		getChildView("Blank")->setEnabled(mImageAssetID != mBlankImageAssetID || mTentative);
+		getChildView("Blank")->setEnabled((mImageAssetID != mBlankImageAssetID && mBlankImageAssetID != mDefaultImageAssetID) || mTentative);
 		getChildView("None")->setEnabled(mAllowNoTexture && (!mImageAssetID.isNull() || mTentative));
 
 		LLFloater::draw();
@@ -1146,7 +1140,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
 	mOnCloseCallback(NULL),
 	mOnSelectCallback(NULL),
 	mBorderColor( p.border_color() ),
-	mAllowNoTexture( FALSE ),
+	mAllowNoTexture( p.allow_no_texture ),
 	mAllowLocalTexture( TRUE ),
 	mImmediateFilterPermMask( PERM_NONE ),
 	mNonImmediateFilterPermMask( PERM_NONE ),
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 92f6f89af6..1475c8c6fc 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -91,7 +91,7 @@ public:
 		:	image_id("image"),
 			default_image_id("default_image_id"),
 			default_image_name("default_image_name"),
-			allow_no_texture("allow_no_texture"),
+			allow_no_texture("allow_no_texture", false),
 			can_apply_immediately("can_apply_immediately"),
 			no_commit_on_selection("no_commit_on_selection", false),
 		    label_width("label_width", -1),
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 1ca6b49c7d..f0a4fd427e 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -114,39 +114,39 @@ public:
 	};
 
 public:
-						LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-	/*virtual*/ void markDead();		// Override (and call through to parent) to clean up media references
+	LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
+	void markDead() override;		// Override (and call through to parent) to clean up media references
 
-	/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
+	LLDrawable* createDrawable(LLPipeline *pipeline) override;
 
 				void	deleteFaces();
 
 				void	animateTextures();
 	
 	            BOOL    isVisible() const ;
-	/*virtual*/ BOOL	isActive() const;
-	/*virtual*/ BOOL	isAttachment() const;
-	/*virtual*/ BOOL	isRootEdit() const; // overridden for sake of attachments treating themselves as a root object
-	/*virtual*/ BOOL	isHUDAttachment() const;
+	BOOL isActive() const override;
+	BOOL isAttachment() const override;
+	BOOL isRootEdit() const override; // overridden for sake of attachments treating themselves as a root object
+	BOOL isHUDAttachment() const override;
 
 				void	generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
-	/*virtual*/	BOOL	setParent(LLViewerObject* parent);
-				S32		getLOD() const						{ return mLOD; }
+	/*virtual*/	BOOL	setParent(LLViewerObject* parent) override;
+				S32		getLOD() const override				{ return mLOD; }
 				void	setNoLOD()							{ mLOD = NO_LOD; mLODChanged = TRUE; }
 				bool	isNoLOD() const						{ return NO_LOD == mLOD; }
-	const LLVector3		getPivotPositionAgent() const;
+	const LLVector3		getPivotPositionAgent() const override;
 	const LLMatrix4&	getRelativeXform() const				{ return mRelativeXform; }
 	const LLMatrix3&	getRelativeXformInvTrans() const		{ return mRelativeXformInvTrans; }
-	/*virtual*/	const LLMatrix4	getRenderMatrix() const;
+	/*virtual*/	const LLMatrix4	getRenderMatrix() const override;
 				typedef std::map<LLUUID, S32> texture_cost_t;
 				U32 	getRenderCost(texture_cost_t &textures) const;
-    /*virtual*/	F32		getEstTrianglesMax() const;
-    /*virtual*/	F32		getEstTrianglesStreamingCost() const;
-    /* virtual*/ F32	getStreamingCost() const;
-    /*virtual*/ bool getCostData(LLMeshCostData& costs) const;
+    /*virtual*/	F32		getEstTrianglesMax() const override;
+    /*virtual*/	F32		getEstTrianglesStreamingCost() const override;
+    /* virtual*/ F32	getStreamingCost() const override;
+    /*virtual*/ bool getCostData(LLMeshCostData& costs) const override;
 
-	/*virtual*/ U32		getTriangleCount(S32* vcount = NULL) const;
-	/*virtual*/ U32		getHighLODTriangleCount();
+	/*virtual*/ U32		getTriangleCount(S32* vcount = NULL) const override;
+	/*virtual*/ U32		getHighLODTriangleCount() override;
 	/*virtual*/ BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, 
 										  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
 										  BOOL pick_transparent = FALSE,
@@ -157,7 +157,7 @@ public:
 										  LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
 										  LLVector4a* normal = NULL,             // return the surface normal at the intersection point
 										  LLVector4a* tangent = NULL           // return the surface tangent at the intersection point
-		);
+		) override;
 	
 				LLVector3 agentPositionToVolume(const LLVector3& pos) const;
 				LLVector3 agentDirectionToVolume(const LLVector3& dir) const;
@@ -167,17 +167,17 @@ public:
 				
 				BOOL	getVolumeChanged() const				{ return mVolumeChanged; }
 				
-	/*virtual*/ F32  	getRadius() const						{ return mVObjRadius; };
-				const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const;
+	F32 getVObjRadius() const override				{ return mVObjRadius; };
+				const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const override;
 
-				void	markForUpdate(BOOL priority);
+				void	markForUpdate(BOOL priority) override;
 				void	markForUnload()							{ LLViewerObject::markForUnload(TRUE); mVolumeChanged = TRUE; }
 				void    faceMappingChanged()                    { mFaceMappingChanged=TRUE; };
 
-	/*virtual*/ void	onShift(const LLVector4a &shift_vector); // Called when the drawable shifts
+	/*virtual*/ void	onShift(const LLVector4a &shift_vector) override; // Called when the drawable shifts
 
-	/*virtual*/ void	parameterChanged(U16 param_type, bool local_origin);
-	/*virtual*/ void	parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_use, bool local_origin);
+	/*virtual*/ void	parameterChanged(U16 param_type, bool local_origin) override;
+	/*virtual*/ void	parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_use, bool local_origin) override;
 
     // update mReflectionProbe based on isReflectionProbe()
     void updateReflectionProbePtr();
@@ -185,40 +185,40 @@ public:
 	/*virtual*/ U32		processUpdateMessage(LLMessageSystem *mesgsys,
 											void **user_data,
 											U32 block_num, const EObjectUpdateType update_type,
-											LLDataPacker *dp);
-
-	/*virtual*/ void	setSelected(BOOL sel);
-	/*virtual*/ BOOL	setDrawableParent(LLDrawable* parentp);
-
-	/*virtual*/ void	setScale(const LLVector3 &scale, BOOL damped);
-
-	/*virtual*/ void    changeTEImage(S32 index, LLViewerTexture* new_image)  ;
-	/*virtual*/ void	setNumTEs(const U8 num_tes);
-	/*virtual*/ void	setTEImage(const U8 te, LLViewerTexture *imagep);
-	/*virtual*/ S32		setTETexture(const U8 te, const LLUUID &uuid);
-	/*virtual*/ S32		setTEColor(const U8 te, const LLColor3 &color);
-	/*virtual*/ S32		setTEColor(const U8 te, const LLColor4 &color);
-	/*virtual*/ S32		setTEBumpmap(const U8 te, const U8 bump);
-	/*virtual*/ S32		setTEShiny(const U8 te, const U8 shiny);
-	/*virtual*/ S32		setTEFullbright(const U8 te, const U8 fullbright);
-	/*virtual*/ S32		setTEBumpShinyFullbright(const U8 te, const U8 bump);
-	/*virtual*/ S32		setTEMediaFlags(const U8 te, const U8 media_flags);
-	/*virtual*/ S32		setTEGlow(const U8 te, const F32 glow);
-	/*virtual*/ S32		setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID);
+											LLDataPacker *dp) override;
+
+	/*virtual*/ void	setSelected(BOOL sel) override;
+	/*virtual*/ BOOL	setDrawableParent(LLDrawable* parentp) override;
+
+	/*virtual*/ void	setScale(const LLVector3 &scale, BOOL damped) override;
+
+	/*virtual*/ void    changeTEImage(S32 index, LLViewerTexture* new_image) override;
+	/*virtual*/ void	setNumTEs(const U8 num_tes) override;
+	/*virtual*/ void	setTEImage(const U8 te, LLViewerTexture *imagep) override;
+	/*virtual*/ S32		setTETexture(const U8 te, const LLUUID &uuid) override;
+	/*virtual*/ S32		setTEColor(const U8 te, const LLColor3 &color) override;
+	/*virtual*/ S32		setTEColor(const U8 te, const LLColor4 &color) override;
+	/*virtual*/ S32		setTEBumpmap(const U8 te, const U8 bump) override;
+	/*virtual*/ S32		setTEShiny(const U8 te, const U8 shiny) override;
+	/*virtual*/ S32		setTEFullbright(const U8 te, const U8 fullbright) override;
+	/*virtual*/ S32		setTEBumpShinyFullbright(const U8 te, const U8 bump) override;
+	/*virtual*/ S32		setTEMediaFlags(const U8 te, const U8 media_flags) override;
+	/*virtual*/ S32		setTEGlow(const U8 te, const F32 glow) override;
+	/*virtual*/ S32		setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID) override;
 	
 	static void	setTEMaterialParamsCallbackTE(const LLUUID& objectID, const LLMaterialID& pMaterialID, const LLMaterialPtr pMaterialParams, U32 te);
 
-	/*virtual*/ S32		setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams);
-	/*virtual*/ S32		setTEScale(const U8 te, const F32 s, const F32 t);
-	/*virtual*/ S32		setTEScaleS(const U8 te, const F32 s);
-	/*virtual*/ S32		setTEScaleT(const U8 te, const F32 t);
-	/*virtual*/ S32		setTETexGen(const U8 te, const U8 texgen);
-	/*virtual*/ S32		setTEMediaTexGen(const U8 te, const U8 media);
-	/*virtual*/ BOOL 	setMaterial(const U8 material);
+	/*virtual*/ S32		setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams) override;
+	/*virtual*/ S32		setTEScale(const U8 te, const F32 s, const F32 t) override;
+	/*virtual*/ S32		setTEScaleS(const U8 te, const F32 s) override;
+	/*virtual*/ S32		setTEScaleT(const U8 te, const F32 t) override;
+	/*virtual*/ S32		setTETexGen(const U8 te, const U8 texgen) override;
+	/*virtual*/ S32		setTEMediaTexGen(const U8 te, const U8 media) override;
+	/*virtual*/ BOOL 	setMaterial(const U8 material) override;
 
 				void	setTexture(const S32 face);
 				S32     getIndexInTex(U32 ch) const {return mIndexInTex[ch];}
-	/*virtual*/ BOOL	setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false);
+	/*virtual*/ BOOL	setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false) override;
 				void	updateSculptTexture();
 				void    setIndexInTex(U32 ch, S32 index) { mIndexInTex[ch] = index ;}
 				void	sculpt();
@@ -227,21 +227,21 @@ public:
 												 void* user_data, S32 status, LLExtStat ext_status);
 					
 				void	updateRelativeXform(bool force_identity = false);
-	/*virtual*/ BOOL	updateGeometry(LLDrawable *drawable);
-	/*virtual*/ void	updateFaceSize(S32 idx);
-	/*virtual*/ BOOL	updateLOD();
-				void	updateRadius();
-	/*virtual*/ void	updateTextures();
+	/*virtual*/ BOOL	updateGeometry(LLDrawable *drawable) override;
+	/*virtual*/ void	updateFaceSize(S32 idx) override;
+	/*virtual*/ BOOL	updateLOD() override;
+				void	updateRadius() override;
+	/*virtual*/ void	updateTextures() override;
 				void	updateTextureVirtualSize(bool forced = false);
 
 				void	updateFaceFlags();
 				void	regenFaces();
 				BOOL	genBBoxes(BOOL force_global);
 				void	preRebuild();
-	virtual		void	updateSpatialExtents(LLVector4a& min, LLVector4a& max);
-	virtual		F32		getBinRadius();
+	virtual		void	updateSpatialExtents(LLVector4a& min, LLVector4a& max) override;
+	virtual		F32		getBinRadius() override;
 	
-	virtual U32 getPartitionType() const;
+	virtual U32 getPartitionType() const override;
 
 	// For Lights
 	void setIsLight(BOOL is_light);
@@ -300,11 +300,11 @@ public:
 
 	// Flexible Objects
 	U32 getVolumeInterfaceID() const;
-	virtual BOOL isFlexible() const;
-	virtual BOOL isSculpted() const;
-	virtual BOOL isMesh() const;
-	virtual BOOL isRiggedMesh() const;
-	virtual BOOL hasLightTexture() const;
+	virtual BOOL isFlexible() const override;
+	virtual BOOL isSculpted() const override;
+	virtual BOOL isMesh() const override;
+	virtual BOOL isRiggedMesh() const override;
+	virtual BOOL hasLightTexture() const override;
 
     
 	BOOL isVolumeGlobal() const;
@@ -321,12 +321,12 @@ public:
     void onSetExtendedMeshFlags(U32 flags);
     void setExtendedMeshFlags(U32 flags);
     bool canBeAnimatedObject() const;
-    bool isAnimatedObject() const;
-    virtual void onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent);
-    virtual void afterReparent();
+    bool isAnimatedObject() const override;
+    virtual void onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent) override;
+    virtual void afterReparent() override;
 
     //virtual
-    void updateRiggingInfo();
+    void updateRiggingInfo() override;
     S32 mLastRiggingInfoLOD;
     
     // Functions that deal with media, or media navigation
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 82a5b28576..ac9c385405 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -372,8 +372,12 @@ void validate_framebuffer_object();
 // for_impostor -- whether or not these render targets are for an impostor (if true, avoids implicit sRGB conversions)
 bool addDeferredAttachments(LLRenderTarget& target, bool for_impostor = false)
 {
-	return target.addColorAttachment(for_impostor ? GL_RGBA : GL_SRGB8_ALPHA8) && //specular
-			target.addColorAttachment(GL_RGB10_A2); //normal+z
+    bool pbr = gSavedSettings.getBOOL("RenderPBR");
+    bool valid = true
+        && target.addColorAttachment(for_impostor ? GL_RGBA : GL_SRGB8_ALPHA8) // frag-data[1] specular or PBR packed OcclusionRoughnessMetal
+        && target.addColorAttachment(GL_RGB10_A2)                              // frag_data[2] normal+z+fogmask, See: class1\deferred\materialF.glsl & softenlight
+        && (pbr ? target.addColorAttachment(GL_RGBA) : true);                  // frag_data[3] emissive
+    return valid;
 }
 
 LLPipeline::LLPipeline() :
diff --git a/indra/newview/skins/default/textures/icons/Inv_Material.png b/indra/newview/skins/default/textures/icons/Inv_Material.png
new file mode 100644
index 0000000000..f5918ceaed
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Material.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index a36b859b6c..b0ae5fe447 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -303,6 +303,7 @@ with the same filename but different name
   <texture name="Inv_LostClosed" file_name="icons/Inv_LostClosed.png" preload="false" />
   <texture name="Inv_LostOpen" file_name="icons/Inv_LostOpen.png" preload="false" />
   <texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" />
+  <texture name="Inv_Material" file_name="icons/Inv_Material.png" preload="false" />
   <texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />  
   <texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" />
   <texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index d783d1e23c..e91efb89b2 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="466"
+ height="486"
  layout="topleft"
  name="Inventory Finder"
  help_topic="inventory_finder"
@@ -95,12 +95,29 @@
      width="126" />
     <icon
      height="16"
+     image_name="Inv_Material"
+     layout="topleft"
+     left="8"
+     mouse_opaque="true"
+     name="icon_material"
+     top="122"
+     width="16" />
+    <check_box
+     height="16"
+     label="Materials"
+     layout="topleft"
+     left_pad="2"
+     name="check_material"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
      image_name="Inv_Notecard"
      layout="topleft"
      left="8"
      mouse_opaque="true"
      name="icon_notecard"
-     top="122"
+     top="142"
      width="16" />
     <check_box
      height="16"
@@ -117,7 +134,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_object"
-     top="142"
+     top="162"
      width="16" />
     <check_box
      height="16"
@@ -134,7 +151,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_script"
-     top="162"
+     top="182"
      width="16" />
     <check_box
      height="16"
@@ -151,7 +168,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_sound"
-     top="182"
+     top="202"
      width="16" />
     <check_box
      height="16"
@@ -168,7 +185,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_texture"
-     top="202"
+     top="222"
      width="16" />
     <check_box
      height="16"
@@ -185,7 +202,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_snapshot"
-     top="222"
+     top="242"
      width="16" />
     <check_box
      height="16"
@@ -202,7 +219,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_settings"
-     top="242"
+     top="262"
      width="16" />
     <check_box
      height="16"
@@ -220,7 +237,7 @@
      layout="topleft"
      left="8"
      name="All"
-     top="262"
+     top="282"
      width="100" />
     <button
      height="20"
@@ -274,7 +291,7 @@
      width="260"/>
     <check_box
      height="16"
-     top="352"
+     top="372"
      label="Since Logoff"
      layout="topleft"
      left_delta="0"
@@ -290,7 +307,7 @@
      layout="topleft"
      left_delta="0"
      name="- OR -"
-     top="370"
+     top="390"
      width="144">
         - OR -
     </text>
@@ -298,7 +315,7 @@
      height="16"
      layout="topleft"
      name="date_search_direction"
-     top="388"
+     top="408"
      left="8"
      width="270">
      <radio_item
@@ -368,6 +385,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="434"
+     top="454"
      width="76" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 5d72e6f79d..815a53a887 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -3,12 +3,22 @@
  legacy_header_height="18"
  can_resize="false"
  default_tab_group="1"
- height="777"
+ height="887"
  layout="topleft"
  name="material editor"
  help_topic="material_editor"
- title="Material: [MATERIAL_NAME]"
+ title="[MATERIAL_NAME]"
  width="256">
+  <string name="no_upload_fee_string">no upload fee</string>
+  <string name="upload_fee_string">L$10 upload fee</string>
+  <check_box
+          follows="left|top"
+          label="Double Sided"
+          left="14"
+          top="14"
+          name="double sided"
+          height="25"
+          width="120" />
   <panel
     border="true"
          follows="left|top"
@@ -18,10 +28,11 @@
          left="5"
          mouse_opaque="false"
          name="Texture"
-         top="20"
+         top_pad="5"
          >
   <text
              type="string"
+             font.style="BOLD"
              length="1"
              follows="left|top"
              height="10"
@@ -31,18 +42,33 @@
              width="64">
     Albedo:
   </text>
-  <texture_picker
-             can_apply_immediately="true"
+    <texture_picker
+             can_apply_immediately="false"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              top_pad="8"
              height="151"
              layout="topleft"
              left="10"
-             name="albedo texture"
+             name="albedo_texture"
              tool_tip="Albedo map.  Alpha channel is optional and used for transparency."
              width="128" />
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="128"
+               layout="topleft"
+               left="10"
+               top_pad="-17"
+               name="albedo_upload_fee"
+             >
+      No upload fee
+    </text>
   <text
              type="string"
              length="1"
@@ -50,12 +76,12 @@
              height="10"
              layout="topleft"
              left_pad="5"
-             top_delta="-15"
+             top="8"
              >
     Tint
   </text>
   <color_swatch
-                    can_apply_immediately="true"
+                    can_apply_immediately="false"
                     follows="left|top"
                     height="40"
                     label_height="0"
@@ -152,7 +178,7 @@
     border="true"
          follows="left|top"
          width="246"
-         height="160"
+         height="175"
          layout="topleft"
          left="5"
          mouse_opaque="false"
@@ -161,36 +187,52 @@
          >
     <text
              type="string"
+             font.style="BOLD"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
              left="10"
-             top_pad="5"
+             top="5"
              >
     Metallic-Roughness:
   </text>
-  <texture_picker
-             can_apply_immediately="true"
+    <texture_picker
+             can_apply_immediately="false"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
+             allow_no_texture="true"
              follows="left|top"
              width="128" 
              height="151"
              layout="topleft"
              left="10"
-             name="metallic-roughness texture"
+             name="metallic_roughness_texture"
              tool_tip="GLTF metallic-roughness map with optional occlusion.  Red channel is occlusion, green channel is roughness, blue channel is metalness."
              top_pad="8"
              />
   <text
              type="string"
+             font.style="BOLD"
+             length="1"
+             follows="left|top"
+             height="10"
+             width="128"
+             layout="topleft"
+             left="10"
+             top_pad="-17"
+             name="metallic_upload_fee"
+           >
+    No upload fee
+  </text>
+  <text
+             type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
              left_pad="5"
-             top_delta="-15"
+             top="8"
              >
     Metallic Factor
   </text>
@@ -237,7 +279,7 @@
     border="true"
          follows="left|top"
          width="246"
-         height="160"
+         height="175"
          layout="topleft"
          left="5"
          mouse_opaque="false"
@@ -246,6 +288,7 @@
          >
     <text
                type="string"
+               font.style="BOLD"
                length="1"
                follows="left|top"
                height="10"
@@ -256,29 +299,44 @@
       Emissive:
     </text>
     <texture_picker
-               can_apply_immediately="true"
+               can_apply_immediately="false"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
+               allow_no_texture="true"
                follows="left|top"
                top_pad="8"
                height="151"
                layout="topleft"
                left="10"
-               name="emissive texture"
+               name="emissive_texture"
                width="128" />
     <text
                type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="128"
+               layout="topleft"
+               left="10"
+               top_pad="-17"
+               name="emissive_upload_fee"
+           >
+      No upload fee
+    </text>
+    <text
+               type="string"
                length="1"
                follows="left|top"
                height="10"
                layout="topleft"
                left_pad="5"
-               top_delta="-15"
+               top="8"
              >
       Tint
     </text>
     <color_swatch
-                      can_apply_immediately="true"
+                      can_apply_immediately="false"
                       follows="left|top"
                       height="40"
                       label_height="0"
@@ -316,7 +374,7 @@
     border="true"
          follows="left|top"
          width="246"
-         height="160"
+         height="175"
          layout="topleft"
          left="5"
          mouse_opaque="false"
@@ -324,6 +382,7 @@
          >
     <text
                type="string"
+               font.style="BOLD"
                length="1"
                follows="left|top"
                height="10"
@@ -334,41 +393,104 @@
       Normal:
     </text>
     <texture_picker
-               can_apply_immediately="true"
+               can_apply_immediately="false"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
+               allow_no_texture="true"
                follows="left|top"
                top_pad="8"
                height="151"
                layout="topleft"
                left="10"
-               name="normal texture"
+               name="normal_texture"
                width="128" />
-    <!--<check_box
-          follows="left|top"
-          label="Mikkt Space"
-          left_pad="10"
-          top_delta="0"
-          height="25"
-          width="120" />-->
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="128"
+               layout="topleft"
+               left="10"
+               top_pad="-17"
+               name="normal_upload_fee"
+           >
+      No upload fee
+    </text>
+  </panel>
+
+  <panel
+         follows="right|bottom"
+         width="246"
+         height="82"
+         layout="bottomright"
+         top_delta="-2"
+         left="0"
+         name="button_panel"
+         >
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="200"
+               layout="topleft"
+               left="10"
+               top="0"
+           >
+      Usaved changes
+    </text>
+    <button
+               follows="left|top"
+               height="25"
+               label="Save"
+               layout="topleft"
+               name="save"
+               top_pad="7"
+               left="5"
+               width="120" />
+    <button
+               follows="left|top"
+               height="25"
+               label="Save As..."
+               layout="topleft"
+               name="save_as"
+               top_delta="0"
+               left_pad="6"
+               width="120" />
+    <text
+               type="string"
+               font.style="BOLD"
+               length="1"
+               follows="left|top"
+               height="10"
+               width="240"
+               layout="topleft"
+               left="10"
+               top_pad="5"
+           >
+      Total upload fee: L$ [FEE]
+    </text>
+    
+    <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="5"
+        name="button_border"
+        top_pad="7"
+        width="246"/>
+    
+    <button
+               follows="left|top"
+               height="25"
+               label="Cancel"
+               layout="topleft"
+               name="cancel"
+               top_pad="7"
+               left="61"
+               width="121" />
   </panel>
-  <check_box
-          follows="left|top"
-          label="Double Sided"
-          left="5"
-          top_pad="5"
-          name="double sided"
-          height="25"
-          width="120" />
-  <button
-             follows="right|bottom"
-             height="25"
-             label="Save"
-             layout="bottomright"
-             name="save"
-             tool_tip="Browse for an editor (executable) to edit floater XML files"
-             top_delta="-2"
-             left="5"
-             width="246" />
-  
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 786cf32e7a..23a9632ada 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9025,7 +9025,47 @@ Unable to upload texture.
 [REASON]   
   <tag>fail</tag>  
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadMaterial"
+   type="alertmodal">
+There was a problem uploading the file
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ label="Save Material"
+ name="SaveMaterialAs"
+ type="alertmodal">
+    <unique/>
+    Name this material:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+        [DESC]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidMaterialName"
+   type="alertmodal">
+Please enter a non-empty name
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="LivePreviewUnavailable"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0866f29355..e1678f418f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2414,6 +2414,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="Clothing"      value=" Clothing," />
 	<string name="Gestures"      value=" Gestures," />
 	<string name="Landmarks"     value=" Landmarks," />
+	<string name="Materials"     value=" Materials," />
 	<string name="Notecards"     value=" Notecards," />
 	<string name="Objects"       value=" Objects," />
 	<string name="Scripts"       value=" Scripts," />