livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SL-17697 local_id usage

meow-7.2.2
Brad Kittenbrink (Brad Linden) 2022-10-11 18:08:15 -07:00 committed by Brad Kittenbrink
parent bda4206627
commit c6bb0fef90
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llmaterialeditor.cpp
View File

@ -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;
}

4
indra/newview/llmaterialeditor.h
View File

@ -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;
};

2
indra/newview/llpanelface.cpp
View File

@ -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);
}
}