diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-06-13 14:59:28 -0700 |
| commit | 5e60392c273f0c9c5efa765a05414c618381780a (patch) | |
| tree | d1eedbb1dfa86e66532a6d8746b7a81e5a444d3a /indra/newview/llfloaterperms.h | |
| parent | 0f3c3563b0861e8ea82b201aab8343d99f993bbc (diff) | |
| parent | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (diff) | |
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llfloaterperms.h')
| -rw-r--r-- | indra/newview/llfloaterperms.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h index 639d678781..ad3776a8c6 100644 --- a/indra/newview/llfloaterperms.h +++ b/indra/newview/llfloaterperms.h @@ -37,7 +37,7 @@ class LLFloaterPerms : public LLFloater friend class LLFloaterReg; public: - /*virtual*/ BOOL postBuild(); + bool postBuild() override; // Convenience methods to get current permission preference bitfields from saved settings: static U32 getEveryonePerms(std::string prefix=""); // prefix + "EveryoneCopy" @@ -55,7 +55,7 @@ class LLFloaterPermsDefault : public LLFloater friend class LLFloaterReg; public: - /*virtual*/ BOOL postBuild(); + bool postBuild() override; void ok(); void cancel(); void onClickOK(); @@ -81,7 +81,7 @@ enum Categories private: LLFloaterPermsDefault(const LLSD& seed); - void refresh(); + void refresh() override; static const std::string sCategoryNames[CAT_LAST]; static void updateCapCoro(std::string url); |