From 309b1d2f16d80d2350c3e0950f96d721ee69a73f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 16 May 2022 18:49:10 +0200 Subject: [PATCH] We already know we're in OpenSim --- indra/newview/llinventorymodel.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index fc4c20777d..0d0161ddda 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2928,14 +2928,12 @@ void LLInventoryModel::buildParentChildMap() // FIRE-31634 [OPENSIM] Inventory Validation fails on old and grandfathered inventories // We will report the errors but allow the user to continue. #ifdef OPENSIM - if(LLGridManager::getInstance()->isInOpenSim()) + if (LLGridManager::getInstance()->isInOpenSim()) { LLSD args; LLSD grid_info; LLGridManager::getInstance()->getGridData(grid_info); - std::string grid_label = LLGridManager::getInstance()->getGridLabel(); - bool is_opensim = LLGridManager::getInstance()->isInOpenSim(); - if (is_opensim && grid_info.has("help")) + if (grid_info.has("help")) { args["HELP"] = grid_info["help"].asString(); }