diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-25 17:39:45 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-25 17:39:45 +0000 |
| commit | b50faa9b6fecf85fee40f1777f17abe604f1fbb0 (patch) | |
| tree | 33beee3dc867c9d84631e6b06801f747e7b8a303 /indra/newview/llfloaterfixedenvironment.h | |
| parent | c822d8af16428cf245ae57305a4f39d3fccd672b (diff) | |
| parent | 3bbfd3c676e098f986aad887fe24c7a4dbfd84c4 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #31)
MAINT-8886 EEP - Implement code for load button in fixed environment floater
Approved-by: Simon Linden <simon@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.h')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h index ef47941555..f3b14c2daf 100644 --- a/indra/newview/llfloaterfixedenvironment.h +++ b/indra/newview/llfloaterfixedenvironment.h @@ -75,6 +75,7 @@ protected: virtual void doApplyCreateNewInventory(); virtual void doApplyUpdateInventory(); virtual void doApplyEnvironment(const std::string &where); + void doCloseInventoryFloater(bool quitting = false); bool canUseInventory() const; bool canApplyRegion() const; @@ -84,6 +85,7 @@ protected: LLUUID mInventoryId; LLInventoryItem * mInventoryItem; + LLHandle<LLFloater> mInventoryFloater; void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results); void onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results); @@ -94,7 +96,9 @@ private: void onButtonImport(); void onButtonApply(LLUICtrl *ctrl, const LLSD &data); void onButtonCancel(); + void onButtonLoad(); + void onPickerCommitSetting(LLUUID asset_id); void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status); }; |