summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterexperienceprofile.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-06-28 11:02:11 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-06-28 11:02:11 -0400
commit726851b039b0b0e7d623970f32b6b28616a07dc8 (patch)
tree01dd9d23638486031dcc49d201c35d8338091794 /indra/newview/llfloaterexperienceprofile.cpp
parente9d2f57866e7e4dcb46b21bef525eb9955691578 (diff)
parent6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff)
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
Diffstat (limited to 'indra/newview/llfloaterexperienceprofile.cpp')
-rw-r--r--indra/newview/llfloaterexperienceprofile.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index a99a096ea7..f6afdd29fb 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -92,8 +92,10 @@ class LLExperienceHandler : public LLCommandHandler
public:
LLExperienceHandler() : LLCommandHandler("experience", 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() != 2 || params[1].asString() != "profile")
return false;