diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-11 13:52:19 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-11 13:52:19 -0700 |
| commit | c352483f62540d67e6ff5704d272c0b2f0b08222 (patch) | |
| tree | 34e499a19f1da66ca6375bc3bfc901f848666df2 /indra/newview/llviewerobject.cpp | |
| parent | 9cac312f57391792e9fce380c2c38ae4060ae1d7 (diff) | |
PATH-704: Enforcing permanency only for static objects on neighboring regions.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index bfde167f18..2c4392ad33 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -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 |