summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-04-05 17:12:28 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-04-05 17:12:28 -0700
commit49e455d0c64c565d243a9a1fbbe47acc8031fb65 (patch)
treeb392e64f21b86134551b70ed25cc21c9e74709a0
parent490e487ab113202b05381b713e49f2196e54ce20 (diff)
Disabling the terrain frozen editing warning when debug optionPathfindingDisablePermanentObjects is set to true.
-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 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;