diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-03-19 10:08:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 10:08:34 -0700 |
| commit | 052a8a78e8b024bda1db6e5359c0d091b2a72d06 (patch) | |
| tree | 26e676bedf2fd31d00ee0274483e1bc13ef3f766 /indra/newview/llmaterialeditor.cpp | |
| parent | 2a325fdebadd32a230f10b372b25ec5474e50f63 (diff) | |
| parent | d0458c4853a6b1923439af8ebc2701410d838473 (diff) | |
Merge pull request #1014 from secondlife/v-1006
secondlife/viewer#1006: Review feedback: Move blank material constant to indra_constants.h
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index f939418893..b54617870c 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -2124,7 +2124,7 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe // Look for the item to base permissions off of item_out = nullptr; - const bool blank_material = func.mMaterialId == LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID; + const bool blank_material = func.mMaterialId == BLANK_MATERIAL_ASSET_ID; if (!blank_material) { LLAssetIDMatchesWithPerms item_has_perms(func.mMaterialId, ops); |