diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-11 10:26:41 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-11 10:26:41 -0400 |
commit | 947483cf14bdfcea5e0456fe00662aedfe068809 (patch) | |
tree | ffddb6bc27a2cf1bcc662f28bf1024c80291c997 /indra/newview/llvoicecallhandler.cpp | |
parent | dc8f2ae2ba1a1348f86f412df7f769e6cc2fe541 (diff) | |
parent | 7b54f077b48740c69559c0a2089b6133ed8eb605 (diff) |
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
Diffstat (limited to 'indra/newview/llvoicecallhandler.cpp')
-rw-r--r-- | indra/newview/llvoicecallhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp index 1e993d1384..95e11abd82 100644 --- a/indra/newview/llvoicecallhandler.cpp +++ b/indra/newview/llvoicecallhandler.cpp @@ -38,7 +38,7 @@ public: { } - bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) + bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) { if (!LLUI::getInstance()->mSettingGroups["config"]->getBOOL("EnableVoiceCall")) { |