diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-10-17 00:34:00 +0300 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-10-17 21:26:39 +0300 |
| commit | ce83f77e7a5f32ac00b0a563fcf68ff98957f684 (patch) | |
| tree | dc64fe70a9fb224875948f0cfea7f2dabfb49ef4 /indra/newview/llinventorybridge.cpp | |
| parent | 13ab6a408b1f42de278edf8a2517b9ed3dc6c66d (diff) | |
SL-20232 Allow deletion of folders with worn content in tree view #3
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 4d7fc41ae3..02ca331bff 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2430,7 +2430,7 @@ BOOL LLFolderBridge::isItemRemovable(bool check_worn) const LLFolderViewFolder* folderp = dynamic_cast<LLFolderViewFolder*>(panel ? panel->getItemByID(mUUID) : NULL); if (folderp) { - LLIsItemRemovable folder_test; + LLIsItemRemovable folder_test(check_worn); folderp->applyFunctorToChildren(folder_test); if (!folder_test.mPassed) { @@ -6626,6 +6626,26 @@ LLInventoryObject* LLObjectBridge::getObject() const return object; } +LLViewerInventoryItem* LLObjectBridge::getItem() const +{ + LLInventoryModel* model = getInventoryModel(); + if (model) + { + return model->getItem(mUUID); + } + return NULL; +} + +LLViewerInventoryCategory* LLObjectBridge::getCategory() const +{ + LLInventoryModel* model = getInventoryModel(); + if (model) + { + return model->getCategory(mUUID); + } + return NULL; +} + // virtual void LLObjectBridge::performAction(LLInventoryModel* model, std::string action) { |