From c352483f62540d67e6ff5704d272c0b2f0b08222 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 11 Jun 2012 13:52:19 -0700 Subject: PATH-704: Enforcing permanency only for static objects on neighboring regions. --- indra/newview/lltoolbrush.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'indra/newview/lltoolbrush.cpp') diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index a963ef2ea6..8c5b534d63 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -247,12 +247,6 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() } } - if (!gAgent.isGodlike() && !gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) - { - alertNoTerraformWhileFrozen(); - return; - } - for(region_list_t::iterator iter = mLastAffectedRegions.begin(); iter != mLastAffectedRegions.end(); ++iter) { @@ -389,12 +383,6 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask) return TRUE; } - if (!gAgent.isGodlike() && !gSavedSettings.getBOOL("PathfindingDisablePermanentObjects") && !LLPathfindingManager::getInstance()->isAllowAlterPermanent()) - { - alertNoTerraformWhileFrozen(); - return TRUE; - } - LLVector3 pos_region = region_position.getPositionRegion(); U32 grids = regionp->getLand().mGridsPerEdge; S32 i = llclamp( (S32)pos_region.mV[VX], 0, (S32)grids ); -- cgit v1.2.3 From 916bd67532b407541e26b1e6053de65a2b291caa Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 11 Jun 2012 18:16:07 -0700 Subject: PATH-704: More clean-up of the old frozen/unfrozen state for objects and terrain. --- indra/newview/lltoolbrush.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/newview/lltoolbrush.cpp') diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index 8c5b534d63..4ef2a26535 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -672,12 +672,6 @@ void LLToolBrushLand::alertNoTerraform(LLViewerRegion* regionp) } -// static -void LLToolBrushLand::alertNoTerraformWhileFrozen() -{ - LLNotificationsUtil::add("RegionNoTerraformingWhileFrozen"); -} - ///============================================================================ /// Local function definitions ///============================================================================ -- cgit v1.2.3