From b76f036bf6af7ae3e1b8ffb2edeee21911256820 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 23 Mar 2012 14:22:35 -0700 Subject: PATH-199: Alert the user if he/she attempts to terraform while in Frozen mode. --- indra/newview/lltoolbrush.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'indra/newview/lltoolbrush.cpp') diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index aba43a9715..51cc697d7a 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -52,6 +52,7 @@ #include "llworld.h" #include "llappviewer.h" #include "llparcel.h" +#include "llpathfindingmanager.h" #include "llglheaders.h" @@ -244,6 +245,12 @@ void LLToolBrushLand::modifyLandInSelectionGlobal() alertNoTerraform(regionp); return; } + + if (!LLPathfindingManager::getInstance()->isAllowAlterPermanent()) + { + alertNoTerraformWhileFrozen(); + return; + } } for(region_list_t::iterator iter = mLastAffectedRegions.begin(); @@ -382,6 +389,12 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask) return TRUE; } + if (!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 ); @@ -671,6 +684,12 @@ void LLToolBrushLand::alertNoTerraform(LLViewerRegion* regionp) } +// static +void LLToolBrushLand::alertNoTerraformWhileFrozen() +{ + LLNotificationsUtil::add("RegionNoTerraformingWhileFrozen"); +} + ///============================================================================ /// Local function definitions ///============================================================================ -- cgit v1.2.3