Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

1 files changed, 20 insertions, 4 deletions

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 6b70b40860..7a65231a2d 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -3199,7 +3199,11 @@ S32 LLMaterialEditor::saveTextures()
     {
         mUploadingTexturesCount++;
         work_count++;
-        saveTexture(mBaseColorJ2C, mBaseColorName, mBaseColorTextureUploadId, [key](LLUUID newAssetId, LLSD response)
+
+        // For ease of inventory management, we prepend the material name.
+        std::string name = mMaterialName + ": " + mBaseColorName;
+
+        saveTexture(mBaseColorJ2C, name, mBaseColorTextureUploadId, [key](LLUUID newAssetId, LLSD response)
         {
             LLMaterialEditor* me = LLFloaterReg::findTypedInstance<LLMaterialEditor>("material_editor", key);
             if (me)
@@ -3237,7 +3241,11 @@ S32 LLMaterialEditor::saveTextures()
     {
         mUploadingTexturesCount++;
         work_count++;
-        saveTexture(mNormalJ2C, mNormalName, mNormalTextureUploadId, [key](LLUUID newAssetId, LLSD response)
+
+        // For ease of inventory management, we prepend the material name.
+        std::string name = mMaterialName + ": " + mNormalName;
+
+        saveTexture(mNormalJ2C, name, mNormalTextureUploadId, [key](LLUUID newAssetId, LLSD response)
         {
             LLMaterialEditor* me = LLFloaterReg::findTypedInstance<LLMaterialEditor>("material_editor", key);
             if (me)
@@ -3275,7 +3283,11 @@ S32 LLMaterialEditor::saveTextures()
     {
         mUploadingTexturesCount++;
         work_count++;
-        saveTexture(mMetallicRoughnessJ2C, mMetallicRoughnessName, mMetallicTextureUploadId, [key](LLUUID newAssetId, LLSD response)
+
+        // For ease of inventory management, we prepend the material name.
+        std::string name = mMaterialName + ": " + mMetallicRoughnessName;
+
+        saveTexture(mMetallicRoughnessJ2C, name, mMetallicTextureUploadId, [key](LLUUID newAssetId, LLSD response)
         {
             LLMaterialEditor* me = LLFloaterReg::findTypedInstance<LLMaterialEditor>("material_editor", key);
             if (me)
@@ -3314,7 +3326,11 @@ S32 LLMaterialEditor::saveTextures()
     {
         mUploadingTexturesCount++;
         work_count++;
-        saveTexture(mEmissiveJ2C, mEmissiveName, mEmissiveTextureUploadId, [key](LLUUID newAssetId, LLSD response)
+
+        // For ease of inventory management, we prepend the material name.
+        std::string name = mMaterialName + ": " + mEmissiveName;
+
+        saveTexture(mEmissiveJ2C, name, mEmissiveTextureUploadId, [key](LLUUID newAssetId, LLSD response)
         {
             LLMaterialEditor* me = LLFloaterReg::findTypedInstance<LLMaterialEditor>("material_editor", LLSD(key));
             if (me)