diff options
author | Graham Linden <graham@lindenlab.com> | 2018-12-06 12:52:14 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-12-06 12:52:14 -0800 |
commit | 13d1f84bf6c3c408704901cb3aad6cffaa8ef6da (patch) | |
tree | 666d1588918fc003947d348834b1a6026b297d65 /indra/newview/llsettingsvo.h | |
parent | 7e9033821a96a9d6e80b58fafb4c7da63807b9d4 (diff) | |
parent | cf7658ca3b7731e83ebf424b9c4b7a4c36ce328f (diff) |
Merge
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()); |