livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-13516 MAC build fix

master
Andrey Kleshchev 2020-07-20 20:35:52 +03:00
parent 9d2c405ee4
commit efee1d9637
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatereditextdaycycle.h
View File

@ -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);

5
indra/newview/llfloaterfixedenvironment.h
View File

@ -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();