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

PATH-629: Allowing viewer edits to permanent objects when in god-mode regardless of frozen mode.

meow-7.2.2
Todd Stinson 2012-05-08 18:44:04 -07:00
parent 7a9f62ab30
commit 2d94e8e764
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloatertools.cpp
View File

@ -133,6 +133,7 @@ public:
if(tools_floater)
{
tools_floater->updateLandImpacts();
tools_floater->dirty();
}
}
};

2
indra/newview/llviewerobject.cpp
View File

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