summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-10-22 16:57:04 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-10-29 23:04:00 +0200
commitdab2fa75dd3ab599aecc18ace6c688b7e78dfaa0 (patch)
tree9f55d600f9a9cc4fe96d757f936f102f90dca9ed /indra/newview/llselectmgr.cpp
parent0fd96e62471a4d6c95c5c3a8d6e1de0e59c83379 (diff)
#4876 Fix material not applying
1. Dupplicate call in llselectmgr can cause race conditions 2. lltooldragndrop wasn't updating server in one case
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index be4b449e2a..4762fc555d 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -2073,7 +2073,6 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
objectp->clearTEWaterExclusion(te);
// Blank out most override data on the object and send to server
- objectp->setRenderMaterialID(te, asset_id);
if (should_preserve_transforms && preserved_override)
{
// Apply material with preserved transforms