summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-04-27 11:34:02 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-04-27 11:34:02 -0700
commit1bba68c920315fc2a09cda6e2de35d0ea42a9c8b (patch)
tree0131af3582eae88ee85deaa132bbd763d26fe28d
parent8f5bb9e0fff692efacd1fda6ec6a88017c35ff28 (diff)
PATH-583: BUGFIX Allowing gods to edit the terrain regardless of frozen/unfrozen mode.
-rw-r--r--indra/newview/lltoolbrush.cpp4
1 files changed, 2 insertions, 2 deletions
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;