diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-20 20:35:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-20 20:35:52 +0300 |
| commit | efee1d96372e3d13c29943728ec4249d5e71895c (patch) | |
| tree | 0c802cec77b0552c8bf9433f798297db6c027159 | |
| parent | 9d2c405ee419af3c316939a7fe12fbd97ce49f9b (diff) | |
SL-13516 MAC build fix
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.h | 5 |
2 files changed, 3 insertions, 4 deletions
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<std::string>& 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(); |