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: [PATCH] Fix SL-17697 local_id usage
---
indra/newview/llmaterialeditor.cpp | 8 ++++----
indra/newview/llmaterialeditor.h | 4 ++--
indra/newview/llpanelface.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 9738030e972..c23f9ec4e7a 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;
}
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index aa24b52a96e..96bf8cc7a27 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -217,7 +217,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
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 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
std::string mMaterialNameShort;
std::string mMaterialName;
- LLUUID mOverrideObjectId;
+ U32 mOverrideLocalId;
S32 mOverrideFace;
};
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index ff5128e0c2f..f93a0e7142a 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4603,7 +4603,7 @@ void LLPanelFace::onPbrStartEditing() {
editor->setTitle("Editing material on "s + object_id.asString());
editor->setAssetId(material_id);
editor->setFromGLTFMaterial(material);
- editor->setOverrideTarget(object_id, face);
+ editor->setOverrideTarget(objectp->getLocalID(), face);
}
}
--
GitLab