From 94b92868587c652d7140aa704db42e497482827d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 22 Sep 2022 02:14:51 +0300 Subject: SL-17999 'copy' functionality for 'features' and 'texture' tabs And a fix to prevent message spam --- indra/newview/lltooldraganddrop.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'indra/newview/lltooldraganddrop.cpp') diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 282c84d7fc..be42e6f2b2 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1109,19 +1109,9 @@ void LLToolDragAndDrop::dropMaterialAllFaces(LLViewerObject* hit_obj, { return; } - - S32 num_faces = hit_obj->getNumTEs(); - for (S32 face = 0; face < num_faces; face++) - { - // update viewer side material in anticipation of update from simulator - - // TODO: fix this! - // Calling setRenderMaterialID multiple times sends material param - // updates multiple times and can create race condition. - // Send update only once! - hit_obj->setRenderMaterialID(face, asset_id); - dialog_refresh_all(); - } + + hit_obj->setRenderMaterialIDs(asset_id); + dialog_refresh_all(); // send the update to the simulator hit_obj->sendTEUpdate(); } -- cgit v1.3