diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-05 18:08:31 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-05 18:08:31 +0000 |
| commit | 031dabede84d3772bf857b7aca20b5378b99d06c (patch) | |
| tree | 760856237361fe663f4908f3be4476addb855a5a /indra/newview/llsettingsvo.h | |
| parent | 2f188b36d9b892e48ba72c3485b34036273d755b (diff) | |
| parent | 25e046594464551d6d66eceee0471f10722c53ce (diff) | |
Merged in andreykproductengine/maint-eep (pull request #195)
SL-9924 [EEP] Environment Settings permissions can be dropped by Save As button
Diffstat (limited to 'indra/newview/llsettingsvo.h')
| -rw-r--r-- | indra/newview/llsettingsvo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 0e8312b849..1ad0091871 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -51,7 +51,8 @@ public: static void createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID &parent_id, inventory_result_fn callback = inventory_result_fn()); static void createInventoryItem(const LLSettingsBase::ptr_t &settings, const LLUUID &parent_id, std::string settings_name, inventory_result_fn callback = inventory_result_fn()); - + static void createInventoryItem(const LLSettingsBase::ptr_t &settings, U32 next_owner_perm, const LLUUID &parent_id, std::string settings_name, inventory_result_fn callback = inventory_result_fn()); + static void updateInventoryItem(const LLSettingsBase::ptr_t &settings, LLUUID inv_item_id, inventory_result_fn callback = inventory_result_fn(), bool update_name = true); static void updateInventoryItem(const LLSettingsBase::ptr_t &settings, LLUUID object_id, LLUUID inv_item_id, inventory_result_fn callback = inventory_result_fn()); |