1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h
index ca035e79e0..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();
+        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;