Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

1 files changed, 3 insertions, 13 deletions

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