summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhandler.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-08-23 22:29:40 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-08-23 22:29:40 +0300
commiteca82d7308cbbb3d6c39bb125d261a44604759ba (patch)
tree65657ad801985ac710fdbed8e086b9a7d66df9a9 /indra/newview/llfloaterhandler.cpp
parentbeb6181863bbce18ff7f408014e02a1086bc9711 (diff)
parentd454512050e636a19e4b7545515dea4f4b1bbf0d (diff)
Merge branch 'main' into DRTVWR-588-maint-W
Diffstat (limited to 'indra/newview/llfloaterhandler.cpp')
-rw-r--r--indra/newview/llfloaterhandler.cpp2
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 &params, const LLSD &query_map, LLMediaCtrl *web)
+bool LLFloaterHandler::handle(const LLSD &params, const LLSD &query_map, const std::string& grid, LLMediaCtrl *web)
{
if (params.size() < 1) return false;
LLFloater* floater = NULL;