From 49e455d0c64c565d243a9a1fbbe47acc8031fb65 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 5 Apr 2012 17:12:28 -0700 Subject: Disabling the terrain frozen editing warning when debug optionPathfindingDisablePermanentObjects is set to true. --- indra/newview/lltoolbrush.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index 49ec1703d4..aa3ec22d01 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -247,7 +247,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() } } - if (!LLPathfindingManager::getInstance()->isAllowAlterPermanent()) + if (!gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) { alertNoTerraformWhileFrozen(); return; @@ -389,7 +389,7 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask) return TRUE; } - if (!LLPathfindingManager::getInstance()->isAllowAlterPermanent()) + if (!gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) { alertNoTerraformWhileFrozen(); return TRUE; -- cgit v1.2.3