summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofilepicks.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-09-11 10:26:41 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-09-11 10:26:41 -0400
commit947483cf14bdfcea5e0456fe00662aedfe068809 (patch)
treeffddb6bc27a2cf1bcc662f28bf1024c80291c997 /indra/newview/llpanelprofilepicks.cpp
parentdc8f2ae2ba1a1348f86f412df7f769e6cc2fe541 (diff)
parent7b54f077b48740c69559c0a2089b6133ed8eb605 (diff)
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
Diffstat (limited to 'indra/newview/llpanelprofilepicks.cpp')
-rw-r--r--indra/newview/llpanelprofilepicks.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index c2a0c16df4..ee48ca4a9b 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -87,8 +87,10 @@ public:
return true;
}
- 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 (LLStartUp::getStartupState() < STATE_STARTED)
{