summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-11-10 13:21:30 -0600
committerDave Parks <davep@lindenlab.com>2022-11-10 13:21:30 -0600
commit70b8e17f17045b95bf3bda241ca8e91fc94fa808 (patch)
treedfae1805abc45e5b326d61bcbd3b3ae0dbaf7d52 /indra/newview/llselectmgr.cpp
parent76de36c40520445d7ad77f85cd6c601942b97032 (diff)
parent0ecc677b4970959f1cd7b14f12e01ab331eae6c7 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index c89348be60..c5a5175780 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1818,6 +1818,8 @@ void LLObjectSelection::applyNoCopyPbrMaterialToTEs(LLViewerInventoryItem* item)
}
}
}
+
+ LLGLTFMaterialList::flushUpdates();
}
@@ -2016,6 +2018,8 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
}
} sendfunc(item);
getSelection()->applyToObjects(&sendfunc);
+
+ LLGLTFMaterialList::flushUpdates();
}
//-----------------------------------------------------------------------------