diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-08-15 12:32:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 12:32:25 -0700 |
| commit | c527356f8a94df0dd280d683b26cf9e2938424b6 (patch) | |
| tree | 1ff690377748d0ca9681230f941f9bf6ff4b8e78 /indra/newview/llmaterialeditor.cpp | |
| parent | 50e2973cd2360dedd6baf1c0772d9d009e2628d4 (diff) | |
| parent | 465632214aad5e9979d12247149aa716a23d6899 (diff) | |
Merge pull request #324 from secondlife/SL-20024
SL-20024: Double-check object inventory is not pending when save button pressed
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 41df58914b..92042ad49f 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -1836,6 +1836,10 @@ bool can_use_objects_material(LLSelectedTEGetMatData& func, const std::vector<Pe llassert(LLSelectMgr::getInstance()->getSelection()->getFirstObject()); return false; } + if (selected_object->isInventoryPending()) + { + return false; + } for (PermissionBit op : ops) { if (op == PERM_MODIFY && selected_object->isPermanentEnforced()) |