From efee1d96372e3d13c29943728ec4249d5e71895c Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 20 Jul 2020 20:35:52 +0300 Subject: SL-13516 MAC build fix --- indra/newview/llfloatereditextdaycycle.h | 2 +- indra/newview/llfloaterfixedenvironment.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h index 8685090d16..9a30fb199f 100644 --- a/indra/newview/llfloatereditextdaycycle.h +++ b/indra/newview/llfloatereditextdaycycle.h @@ -146,7 +146,7 @@ private: void removeCurrentSliderFrame(); void removeSliderFrame(F32 frame); - void doImportFromDisk(); + virtual void doImportFromDisk() override; void loadSettingFromFile(const std::vector& filenames); void doApplyCommit(LLSettingsDay::ptr_t day); void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id); diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h index 1620bc101a..00b6c3a570 100644 --- a/indra/newview/llfloaterfixedenvironment.h +++ b/indra/newview/llfloaterfixedenvironment.h @@ -79,9 +79,8 @@ protected: void onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results); void onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results); - bool getIsDirty() const { return mIsDirty; } - void setDirtyFlag() { mIsDirty = true; } - virtual void clearDirtyFlag(); + virtual void clearDirtyFlag() override; + void updatePermissionFlags(); void doSelectFromInventory(); -- cgit v1.2.3