diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-03-10 15:36:58 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-03-10 15:36:58 -0700 |
| commit | d67a3022d3a9432f279768371b27ea5322315905 (patch) | |
| tree | 0254d8a7889ff6639cf6bf9b40f63499df37ceb4 /indra/newview/llviewerparcelaskplay.h | |
| parent | fc462b2b0f7ee153626d162bd97a05110f0804b7 (diff) | |
| parent | b242d696ba03f66494dfca1f05a74ed1b15cd6e4 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llviewerparcelaskplay.h')
| -rw-r--r-- | indra/newview/llviewerparcelaskplay.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelaskplay.h b/indra/newview/llviewerparcelaskplay.h index dc711917d2..56faddae66 100644 --- a/indra/newview/llviewerparcelaskplay.h +++ b/indra/newview/llviewerparcelaskplay.h @@ -34,8 +34,8 @@ class LLViewerParcelAskPlay : public LLSingleton<LLViewerParcelAskPlay> { LLSINGLETON(LLViewerParcelAskPlay); ~LLViewerParcelAskPlay(); - void initSingleton(); - void cleanupSingleton(); + void initSingleton() override; + void cleanupSingleton() override; public: // functor expects functor(region_id, parcel_id, url, play/stop) typedef boost::function<void(const LLUUID&, const S32&, const std::string&, const bool&)> ask_callback; |