diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-27 20:52:28 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-27 20:52:28 +0800 |
| commit | 191170d4328c9d2356d99428276ba2f77977d2af (patch) | |
| tree | deebd5b29213d2a60104f0d09dba6e82c5afbeb5 /indra/newview/llviewerhelp.cpp | |
| parent | 9890ebc0978e0ec3567fb78dba4bd2d4a18855f3 (diff) | |
| parent | 9bc3dfbdeaba904999880f6b59306128c98469e8 (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llviewerhelp.cpp')
| -rw-r--r-- | indra/newview/llviewerhelp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp index e7b150965d..bca1c4166a 100644 --- a/indra/newview/llviewerhelp.cpp +++ b/indra/newview/llviewerhelp.cpp @@ -45,7 +45,7 @@ public: // requests will be throttled from a non-trusted browser LLHelpHandler() : LLCommandHandler("help", UNTRUSTED_CLICK_ONLY) {} - bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) + bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) override { LLViewerHelp* vhelp = LLViewerHelp::getInstance(); if (! vhelp) |