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/llfloaterhandler.cpp | |
parent | dc8f2ae2ba1a1348f86f412df7f769e6cc2fe541 (diff) | |
parent | 7b54f077b48740c69559c0a2089b6133ed8eb605 (diff) |
DRTVWR-588: Merge 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
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; |