diff options
author | Rider Linden <rider@lindenlab.com> | 2018-09-07 16:09:32 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-09-07 16:09:32 -0700 |
commit | 114e358aae80e9e3ca70de093d51e4700c46df37 (patch) | |
tree | c96972974d4f37ba87de5dca99399e596ca41f46 /indra/newview/llsettingsvo.h | |
parent | e539236a75a163b1c6748617bd1e4d2b84aaa3d6 (diff) |
Work to make edit floaters respect no mod and no trans. Importing no-trans frame will cause day cycle to become no trans.
Diffstat (limited to 'indra/newview/llsettingsvo.h')
-rw-r--r-- | indra/newview/llsettingsvo.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index d314eed24e..0d7b7902c1 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -39,12 +39,14 @@ #include <boost/signals2.hpp> class LLVFS; +class LLInventoryItem; //========================================================================= class LLSettingsVOBase : public LLSettingsBase { public: typedef std::function<void(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat extstat)> asset_download_fn; + typedef std::function<void(LLInventoryItem *inv_item, LLSettingsBase::ptr_t settings, S32 status, LLExtStat extstat)> inventory_download_fn; typedef std::function<void(LLUUID asset_id, LLUUID inventory_id, LLUUID object_id, LLSD results)> inventory_result_fn; static void createNewInventoryItem(LLSettingsType::type_e stype, const LLUUID &parent_id, inventory_result_fn callback = inventory_result_fn()); @@ -54,6 +56,7 @@ public: static void updateInventoryItem(const LLSettingsBase::ptr_t &settings, LLUUID object_id, LLUUID inv_item_id, inventory_result_fn callback = inventory_result_fn()); static void getSettingsAsset(const LLUUID &assetId, asset_download_fn callback); + static void getSettingsInventory(const LLUUID &inventoryId, inventory_download_fn callback = inventory_download_fn()); static bool exportFile(const LLSettingsBase::ptr_t &settings, const std::string &filename, LLSDSerialize::ELLSD_Serialize format = LLSDSerialize::LLSD_NOTATION); static LLSettingsBase::ptr_t importFile(const std::string &filename); |