summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.h
diff options
context:
space:
mode:
authorBrad Kittenbrink (Brad Linden) <brad@lindenlab.com>2022-10-11 18:08:15 -0700
committerBrad Kittenbrink <brad@lindenlab.com>2022-10-14 14:44:05 -0700
commitc6bb0fef90b0c2c6557b933b0bc57cabd66fa572 (patch)
treea8bd44a9eb616955f6d7129e3592d09f3f063bc7 /indra/newview/llmaterialeditor.h
parentbda420662710e95de1b3f6ff954459b4bb6c3b01 (diff)
Fix SL-17697 local_id usage
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
-rw-r--r--indra/newview/llmaterialeditor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index aa24b52a96..96bf8cc7a2 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -217,7 +217,7 @@ public:
void loadDefaults();
void modifyMaterialCoro(std::string cap_url, LLSD overrides);
- void setOverrideTarget(const LLUUID& object_id, S32 face_id);
+ void setOverrideTarget(U32 local_id, S32 face_id);
private:
void loadMaterial(const tinygltf::Model &model, const std::string &filename_lc, S32 index);
@@ -269,7 +269,7 @@ private:
std::string mMaterialNameShort;
std::string mMaterialName;
- LLUUID mOverrideObjectId;
+ U32 mOverrideLocalId;
S32 mOverrideFace;
};