From 2d27a6ac31009fd5ad828b6d769393f1cbfd3694 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 24 Aug 2023 00:12:24 +0300
Subject: [PATCH] DRTVWR-587 Post-merge build fix

---
 indra/newview/llfloaterpreference.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index e59c2ee2cd8..47a78c049a1 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -264,7 +264,7 @@ class LLKeybindingHandler: public LLCommandHandler
     }
 
     bool handle(const LLSD& params, const LLSD& query_map,
-                LLMediaCtrl* web)
+                const std::string& grid, LLMediaCtrl* web)
     {
         if (params.size() < 1) return false;
 
-- 
GitLab