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/llpanelprofile.cpp | |
| parent | dc8f2ae2ba1a1348f86f412df7f769e6cc2fe541 (diff) | |
| parent | 7b54f077b48740c69559c0a2089b6133ed8eb605 (diff) | |
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 8ac1efe8e7..7aabd5247a 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -461,8 +461,10 @@ public: // requires trusted browser to trigger LLProfileHandler() : LLCommandHandler("profile", UNTRUSTED_THROTTLE) { } - 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 (params.size() < 1) return false; std::string agent_name = params[0]; @@ -509,8 +511,10 @@ public: return false; } - 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 (params.size() < 2) return false; LLUUID avatar_id; |