Merge branch main (DRTVWR-582) into DRTVWR-567

# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp
index 9640b05b06..caa27e530b 100644
--- a/indra/newview/llcommandhandler.cpp
+++ b/indra/newview/llcommandhandler.cpp
@@ -62,6 +62,7 @@ public:
 	bool dispatch(const std::string& cmd,
 				  const LLSD& params,
 				  const LLSD& query_map,
+                  const std::string& grid,
 				  LLMediaCtrl* web,
 				  const std::string& nav_type,
 				  bool trusted_browser);
@@ -98,6 +99,7 @@ void LLCommandHandlerRegistry::add(const char* cmd,
 bool LLCommandHandlerRegistry::dispatch(const std::string& cmd,
 										const LLSD& params,
 										const LLSD& query_map,
+										const std::string& grid,
 										LLMediaCtrl* web,
 										const std::string& nav_type,
 										bool trusted_browser)
@@ -165,7 +167,7 @@ bool LLCommandHandlerRegistry::dispatch(const std::string& cmd,
 		}
 	}
 	if (!info.mHandler) return false;
-	return info.mHandler->handle(params, query_map, web);
+	return info.mHandler->handle(params, query_map, grid, web);
 }
 
 void LLCommandHandlerRegistry::notifySlurlBlocked()
@@ -220,12 +222,13 @@ LLCommandHandler::~LLCommandHandler()
 bool LLCommandDispatcher::dispatch(const std::string& cmd,
 								   const LLSD& params,
 								   const LLSD& query_map,
+								   const std::string& grid,
 								   LLMediaCtrl* web,
 								   const std::string& nav_type,
 								   bool trusted_browser)
 {
 	return LLCommandHandlerRegistry::instance().dispatch(
-		cmd, params, query_map, web, nav_type, trusted_browser);
+		cmd, params, query_map, grid, web, nav_type, trusted_browser);
 }
 
 static std::string lookup(LLCommandHandler::EUntrustedAccess value);