diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 17:30:06 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 17:30:06 +0200 |
commit | 6d077c90a01121e1d11c7a4c8e3867cebf937e0d (patch) | |
tree | 660b4107afc57b4885769c920d9697e72ff41931 /indra/newview/llviewerparcelmedia.h | |
parent | b42e01d7acf5d4c55612c3a7df0e1ff6ee5ed951 (diff) | |
parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) |
Merge branch 'main' into DRTVWR-588-maint-W
Diffstat (limited to 'indra/newview/llviewerparcelmedia.h')
-rw-r--r-- | indra/newview/llviewerparcelmedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h index 779a65bdf8..790b2b71fc 100644 --- a/indra/newview/llviewerparcelmedia.h +++ b/indra/newview/llviewerparcelmedia.h @@ -74,7 +74,7 @@ public: void sendMediaNavigateMessage(const std::string& url); // inherited from LLViewerMediaObserver - virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); + virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override; private: void processParcelMediaCommandMessage(LLMessageSystem *msg); |