diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 15:33:15 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 15:33:15 -0700 |
| commit | 378ae8ce6588ce921b2aa960c08d4293c6b419e5 (patch) | |
| tree | 60430a40b06753c6aa4571cb7b2ee366e711a5f1 /indra/newview/llviewerobject.cpp | |
| parent | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (diff) | |
PATH-199: Enforcing permanent objects in frozen state to not move.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 330cf51b3e..c70ceac525 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -100,6 +100,7 @@ #include "lltrans.h" #include "llsdutil.h" #include "llmediaentry.h" +#include "llpathfindingmanager.h" //#define DEBUG_UPDATE_TYPE @@ -5321,6 +5322,11 @@ void LLViewerObject::markForUpdate(BOOL priority) } } +bool LLViewerObject::isPermanentEnforced() const +{ + return flagObjectPermanent() && !LLPathfindingManager::getInstance()->isAllowAlterPermanent(); +} + bool LLViewerObject::getIncludeInSearch() const { return flagIncludeInSearch(); |