From 1bba68c920315fc2a09cda6e2de35d0ea42a9c8b Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 27 Apr 2012 11:34:02 -0700 Subject: PATH-583: BUGFIX Allowing gods to edit the terrain regardless of frozen/unfrozen mode. --- 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 aa3ec22d01..a963ef2ea6 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -247,7 +247,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() } } - if (!gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) + if (!gAgent.isGodlike() && !gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) { alertNoTerraformWhileFrozen(); return; @@ -389,7 +389,7 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask) return TRUE; } - if (!gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) + if (!gAgent.isGodlike() && !gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) { alertNoTerraformWhileFrozen(); return TRUE; -- cgit v1.2.3