diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
| commit | 726851b039b0b0e7d623970f32b6b28616a07dc8 (patch) | |
| tree | 01dd9d23638486031dcc49d201c35d8338091794 /indra/newview/llfloaterhandler.h | |
| parent | e9d2f57866e7e4dcb46b21bef525eb9955691578 (diff) | |
| parent | 6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff) | |
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
Diffstat (limited to 'indra/newview/llfloaterhandler.h')
| -rw-r--r-- | indra/newview/llfloaterhandler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhandler.h b/indra/newview/llfloaterhandler.h index 5915642d66..959c972275 100644 --- a/indra/newview/llfloaterhandler.h +++ b/indra/newview/llfloaterhandler.h @@ -33,7 +33,7 @@ class LLFloaterHandler { public: LLFloaterHandler() : LLCommandHandler("floater", UNTRUSTED_BLOCK) { } - 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); }; #endif |