diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
commit | 23f2631d598b6e07450a96ed1ec00670c8867cdd (patch) | |
tree | 20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/llfloaterevent.h | |
parent | 54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff) | |
parent | 8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff) |
Merge branch 'develop' into nat/edu-channel
Diffstat (limited to 'indra/newview/llfloaterevent.h')
-rw-r--r-- | indra/newview/llfloaterevent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h index 071b907cd9..3854885a5f 100644 --- a/indra/newview/llfloaterevent.h +++ b/indra/newview/llfloaterevent.h @@ -42,7 +42,7 @@ public: LLFloaterEvent(const LLSD& key); /*virtual*/ ~LLFloaterEvent(); - /*virtual*/ BOOL postBuild(); + bool postBuild() override; void setEventID(const U32 event_id); @@ -51,7 +51,7 @@ public: protected: - /*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event); + void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event) override; U32 mEventID; |