livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-704: Enforcing permanency only for static objects on neighboring regions.

meow-7.2.2
Todd Stinson 2012-06-11 13:52:19 -07:00
parent 9cac312f57
commit c352483f62
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lltoolbrush.cpp
View File

@ -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 );

2
indra/newview/llviewerobject.cpp
View File

@ -5304,7 +5304,7 @@ void LLViewerObject::markForUpdate(BOOL priority)
bool LLViewerObject::isPermanentEnforced() const
{
return flagObjectPermanent() && !LLPathfindingManager::getInstance()->isAllowAlterPermanent() && !gAgent.isGodlike();
return flagObjectPermanent() && (mRegionp != gAgent.getRegion()) && !gAgent.isGodlike();
}
bool LLViewerObject::getIncludeInSearch() const