diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-07 11:15:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-07 11:15:56 -0400 |
| commit | b8e67774397f2878aafc5906845f5f738e00c408 (patch) | |
| tree | 02ed12e0d5534fbf71f3ab8ce222d7508d73166d /indra/newview/llfloaterhandler.cpp | |
| parent | 755f9d9ac9548e27d68ec701676e20c4824833f8 (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
SL-18837: Merge branch 'main' into actions
Diffstat (limited to 'indra/newview/llfloaterhandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterhandler.cpp b/indra/newview/llfloaterhandler.cpp index 8ebb14149c..b66049de7f 100644 --- a/indra/newview/llfloaterhandler.cpp +++ b/indra/newview/llfloaterhandler.cpp @@ -49,7 +49,7 @@ LLFloater* get_parent_floater(LLView* view) } -bool LLFloaterHandler::handle(const LLSD ¶ms, const LLSD &query_map, LLMediaCtrl *web) +bool LLFloaterHandler::handle(const LLSD ¶ms, const LLSD &query_map, const std::string& grid, LLMediaCtrl *web) { if (params.size() < 1) return false; LLFloater* floater = NULL; |