From c6bb0fef90b0c2c6557b933b0bc57cabd66fa572 Mon Sep 17 00:00:00 2001
From: "Brad Kittenbrink (Brad Linden)" <brad@lindenlab.com>
Date: Tue, 11 Oct 2022 18:08:15 -0700
Subject: Fix SL-17697 local_id usage

---
 indra/newview/llmaterialeditor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llmaterialeditor.cpp')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 9738030e97..c23f9ec4e7 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -200,7 +200,7 @@ LLMaterialEditor::LLMaterialEditor(const LLSD& key)
     , mHasUnsavedChanges(false)
     , mExpectedUploadCost(0)
     , mUploadingTexturesCount(0)
-    , mOverrideObjectId(LLUUID::null)
+    , mOverrideLocalId(0)
     , mOverrideFace(0)
 {
     const LLInventoryItem* item = getItem();
@@ -2259,7 +2259,7 @@ void LLMaterialEditor::modifyMaterialCoro(std::string cap_url, LLSD overrides)
 
     httpOpts->setFollowRedirects(true);
     LLSD body = llsd::map(
-        "local_id", mOverrideObjectId,
+        "local_id", S32(mOverrideLocalId),
         "face", mOverrideFace,
         "overrides", overrides
     );
@@ -2279,8 +2279,8 @@ void LLMaterialEditor::modifyMaterialCoro(std::string cap_url, LLSD overrides)
     }
 }
 
-void LLMaterialEditor::setOverrideTarget(const LLUUID& object_id, S32 face)
+void LLMaterialEditor::setOverrideTarget(U32 local_id, S32 face)
 {
-    mOverrideObjectId = object_id;
+    mOverrideLocalId = local_id;
     mOverrideFace = face;
 }
-- 
cgit v1.2.3