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

indra/newview/llinventorybridge.cpp

@@ -785,7 +785,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 	if (obj)
 	{
 		
-		if (obj->getType() != LLInventoryType::IT_CATEGORY)
+		if (obj->getType() != LLAssetType::AT_CATEGORY)
 		{
 			items.push_back(std::string("Copy Separator"));
 		}
@@ -881,7 +881,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 		}
 	}
 
-	if (obj->getType() != LLInventoryType::IT_CATEGORY)
+	if (obj->getType() != LLAssetType::AT_CATEGORY)
 	{
 		items.push_back(std::string("Paste Separator"));
 	}

indra/newview/llmaterialeditor.h

@@ -57,7 +57,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
 
     void setFromGLTFMaterial(LLGLTFMaterial* mat);
 
-    void loadAsset();
+    void loadAsset() override;
 
     static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status);
 

indra/newview/skins/default/xui/en/strings.xml

@@ -405,6 +405,7 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="symbolic link">link</string>
 	<string name="symbolic folder link">folder link</string>
 	<string name="settings blob">settings</string>
+	<string name="render material">material</string>
 	<string name="mesh">mesh</string>
 
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->