diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
| commit | 94afae5b1552439f69126ecf7cd6716fa692fed6 (patch) | |
| tree | 52abb39e749f4c2e2835e89ff3afd39034d34fba /indra/newview/llviewerobject.cpp | |
| parent | 29e344bbd0043bb1cd5f1defd6f9a193b0cc728e (diff) | |
| parent | 4cb5439e425dbfd354a27cbfbfe071904d068d5d (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 6fcad1a8c7..43525a3173 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -7212,7 +7212,7 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat gAgent.getRegionCapability("ModifyMaterialParams"), llsd::map( "object_id", getID(), - "side", te))); + "side", te), nullptr)); } // update and send LLRenderMaterialParams |