diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-03-10 15:36:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-03-10 15:36:58 -0700 |
| commit | d67a3022d3a9432f279768371b27ea5322315905 (patch) | |
| tree | 0254d8a7889ff6639cf6bf9b40f63499df37ceb4 /indra/newview/llchicletbar.h | |
| parent | fc462b2b0f7ee153626d162bd97a05110f0804b7 (diff) | |
| parent | b242d696ba03f66494dfca1f05a74ed1b15cd6e4 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llchicletbar.h')
| -rw-r--r-- | indra/newview/llchicletbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h index 6c521dc1d5..c295b99962 100644 --- a/indra/newview/llchicletbar.h +++ b/indra/newview/llchicletbar.h @@ -43,11 +43,11 @@ class LLChicletBar public: - BOOL postBuild(); + BOOL postBuild() override; LLChicletPanel* getChicletPanel() { return mChicletPanel; } - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent) override; /** |