diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 17:04:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 17:04:34 -0700 |
| commit | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (patch) | |
| tree | e8b4200dae16e89698c2f3eadae05634041681a1 /indra/newview/llfloatertos.h | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
| parent | ae74ca80692c8bcf157e903033fcfa1778706d64 (diff) | |
Merge pull request #1745 from secondlife/project/gltf_development
move project/gltf development to develop
Diffstat (limited to 'indra/newview/llfloatertos.h')
| -rw-r--r-- | indra/newview/llfloatertos.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h index b4f08be00b..3bec4da58d 100644 --- a/indra/newview/llfloatertos.h +++ b/indra/newview/llfloatertos.h @@ -47,9 +47,9 @@ public: LLFloaterTOS(const LLSD& data); virtual ~LLFloaterTOS(); - BOOL postBuild(); + bool postBuild() override; - virtual void draw(); + void draw() override; static void updateAgree( LLUICtrl *, void* userdata ); static void onContinue( void* userdata ); @@ -60,7 +60,7 @@ public: void updateAgreeEnabled(bool enabled); // inherited from LLViewerMediaObserver - /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); + void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override; private: static void testSiteIsAliveCoro(LLHandle<LLFloater> handle, std::string url); @@ -70,8 +70,6 @@ private: bool mSiteAlive; bool mRealNavigateBegun; std::string mReplyPumpName; - - }; #endif // LL_LLFLOATERTOS_H |