diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-20 14:45:47 -0400 |
commit | c2e902d56ac5d6b6109c1b12254c62ec18ad2199 (patch) | |
tree | eccb10bb1f2a558270fef9faa87ef1333e2f501a /indra/newview/llpathfindinglinksetlist.h | |
parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
parent | 2d28bc112a2db73b521d44e12b3c633cf8eccd7e (diff) |
merge back beta fixes
Diffstat (limited to 'indra/newview/llpathfindinglinksetlist.h')
-rw-r--r-- | indra/newview/llpathfindinglinksetlist.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpathfindinglinksetlist.h b/indra/newview/llpathfindinglinksetlist.h index 77c6358640..1d38e4c11a 100644 --- a/indra/newview/llpathfindinglinksetlist.h +++ b/indra/newview/llpathfindinglinksetlist.h @@ -43,6 +43,7 @@ public: LLSD encodeTerrainFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const; bool isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; + bool isShowPhantomToggleWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; bool isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; void determinePossibleStates(BOOL &pCanBeWalkable, BOOL &pCanBeStaticObstacle, BOOL &pCanBeDynamicObstacle, |