diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2023-08-11 17:18:06 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2023-08-11 17:18:06 -0700 |
| commit | 466914e122f201e62d8e969dcc684791e06333d3 (patch) | |
| tree | 6d68f64f0fd81aa6e7b5d7cff7cd117d37999ada /indra/newview/llmaterialeditor.cpp | |
| parent | 076a02e2d8ddb10856602c3f5f3115ace41327b5 (diff) | |
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()) |