diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-06-27 18:57:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 18:57:02 +0300 |
| commit | ac0f56668b42bbd01396633bbfd6dbda7ea434a5 (patch) | |
| tree | dbb724773d49b1397e192e38770543fff4cf85f2 /indra/newview/llviewerinventory.cpp | |
| parent | fcffbad09007185becf53f2a259701c7e07444f5 (diff) | |
| parent | 6ee6d19f600bb7fee99f96e8476e2c57088dad17 (diff) | |
Merge pull request #1840 from secondlife/inventory_favorites
viewer#1300
viewer#1301
viewer#1424
viewer#1425
viewer#1619
viewer#1005
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 2091a92d5d..425fc17aa9 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1436,7 +1436,8 @@ void update_inventory_category( if(obj) { if (LLFolderType::lookupIsProtectedType(obj->getPreferredType()) - && (updates.size() != 1 || !updates.has("thumbnail"))) + && (updates.size() != 1 + || !(updates.has("thumbnail") || updates.has("favorite")))) { LLNotificationsUtil::add("CannotModifyProtectedCategories"); return; |