summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-29 21:42:44 -0500
committerDave Parks <davep@lindenlab.com>2022-06-29 21:42:44 -0500
commit6f6df8ed71702f0ee8d21a2b583818ae360dd093 (patch)
tree70545286267ecc4419b7d1dfe463c6d08490775a /indra/llprimitive/llprimitive.cpp
parent56ae3e0a083aefcbd6d7c955bb2c7e9e58000a4b (diff)
SL-17685 Drag and drop material support
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
-rw-r--r--indra/llprimitive/llprimitive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 6df7111a47..3f0059b759 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -2430,7 +2430,7 @@ void LLRenderMaterialParams::setMaterial(U8 te, const LLUUID& id)
mEntries.push_back({ te, id });
}
-LLUUID LLRenderMaterialParams::getMaterial(U8 te) const
+const LLUUID& LLRenderMaterialParams::getMaterial(U8 te) const
{
for (int i = 0; i < mEntries.size(); ++i)
{