diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
| commit | cde1174345224d33d6b45b1e3243fa39043223e5 (patch) | |
| tree | 6c8db6e0499622d8c7206a11c997eb173ebd478f /indra/newview/llmediadataclient.h | |
| parent | 6f454ad8366ed33bbe199c3fc3ed69e6d3448cec (diff) | |
| parent | 35efadf78315f9b351415930dca4fae251ef4dd0 (diff) | |
Merge branch 'main' into release/luau-scripting.
Diffstat (limited to 'indra/newview/llmediadataclient.h')
| -rw-r--r-- | indra/newview/llmediadataclient.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h index a5f20e51db..736f4d8537 100644 --- a/indra/newview/llmediadataclient.h +++ b/indra/newview/llmediadataclient.h @@ -219,7 +219,7 @@ protected: { public: RetryTimer(F32 time, Request::ptr_t); - virtual bool tick() override; + bool tick() override; private: // back-pointer Request::ptr_t mRequest; @@ -286,7 +286,13 @@ private: { public: QueueTimer(F32 time, LLMediaDataClient *mdc); +<<<<<<< variant A bool tick() override; +>>>>>>> variant B + virtual bool tick(); +####### Ancestor + virtual BOOL tick(); +======= end private: // back-pointer LLPointer<LLMediaDataClient> mMDC; |