summaryrefslogtreecommitdiff
path: root/indra/newview/lllocalgltfmaterials.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-09-29 23:17:49 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2022-09-29 23:17:49 +0300
commit332ddc67de2de245a52d9db3be20f4ba8051f166 (patch)
treebeed474fae2440a071a85f1d8b47f78376e88b04 /indra/newview/lllocalgltfmaterials.cpp
parent9346b45188462056698083f4f83fe8fecbe19bdf (diff)
SL-17653 Small change in material loading order
Diffstat (limited to 'indra/newview/lllocalgltfmaterials.cpp')
-rw-r--r--indra/newview/lllocalgltfmaterials.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp
index 6e6671d360..02331e9cd7 100644
--- a/indra/newview/lllocalgltfmaterials.cpp
+++ b/indra/newview/lllocalgltfmaterials.cpp
@@ -267,7 +267,7 @@ bool LLLocalGLTFMaterial::loadMaterial(LLPointer<LLGLTFMaterial> mat, S32 index)
if (!material_in.name.empty())
{
- mShortName = material_in.name;
+ mShortName = gDirUtilp->getBaseFileName(filename_lc, true) + " (" + material_in.name + ")";
}
// get base color texture