diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
| commit | dbbb89a13c99dce50b5c2a124bd3a5ccc23ef7f6 (patch) | |
| tree | 51217fdcd57e3adcbe7ba6e428c4e0f0a68012a3 /indra/newview/llfloaterfixedenvironment.h | |
| parent | d6ede8e81cad497a6cd8482dfb48c99bdf5c258a (diff) | |
| parent | d7ae8a0d28483a8ed5d93152177aa655266f7004 (diff) | |
Merge
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); }; |