diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-08-23 12:26:14 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-08-23 12:26:14 -0700 |
| commit | c6d5f11f63dfa0ac65a2afebf88b3078f571e044 (patch) | |
| tree | 63fd8081ce450fd426ea717adc04d09b0da4b713 /indra/newview/llpanelprofile.cpp | |
| parent | ef33902f220df35727ba54ee8bc3ed02bc53d6be (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
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 bf3b4837f0..a9e0d72dcc 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; |