summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2022-11-29 15:20:44 -0800
committerCosmic Linden <cosmic@lindenlab.com>2022-11-29 15:20:44 -0800
commitbfcb07270ed7036c87a4ece7fa1f5416123fff85 (patch)
tree7209d59f44d8d973a99c808c153c0776a224907d /indra/newview/llpanelface.cpp
parentcf86c23dfe1fd732cd939b7fd48fdc7b88bdce1c (diff)
SL-18732: Review feedback
Diffstat (limited to 'indra/newview/llpanelface.cpp')
-rw-r--r--indra/newview/llpanelface.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 21c824ff5c..3d72865f69 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -276,7 +276,7 @@ BOOL LLPanelFace::postBuild()
getChild<LLUICtrl>("gltfTextureOffsetU")->setCommitCallback(boost::bind(&LLPanelFace::onCommitGLTFTextureOffsetU, this, _1), nullptr);
getChild<LLUICtrl>("gltfTextureOffsetV")->setCommitCallback(boost::bind(&LLPanelFace::onCommitGLTFTextureOffsetV, this, _1), nullptr);
- LLGLTFMaterialList::addUpdateCallback(&LLPanelFace::onMaterialOverrideReceived);
+ LLGLTFMaterialList::addSelectionUpdateCallback(&LLPanelFace::onMaterialOverrideReceived);
sMaterialOverrideSelection.connect();
childSetAction("button align",&LLPanelFace::onClickAutoFix,this);
@@ -2056,7 +2056,7 @@ void LLPanelFace::unloadMedia()
// static
void LLPanelFace::onMaterialOverrideReceived(const LLUUID& object_id, S32 side)
{
- sMaterialOverrideSelection.onObjectUpdated(object_id, side);
+ sMaterialOverrideSelection.onSelectedObjectUpdated(object_id, side);
}
//////////////////////////////////////////////////////////////////////////////
@@ -4771,7 +4771,7 @@ void LLPanelFace::Selection::setObjectUpdatePending(const LLUUID &object_id, S32
mPendingSide = side;
}
-void LLPanelFace::Selection::onObjectUpdated(const LLUUID& object_id, S32 side)
+void LLPanelFace::Selection::onSelectedObjectUpdated(const LLUUID& object_id, S32 side)
{
if (object_id == mSelectedObjectID && side == mSelectedSide)
{