diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
commit | 0f958faacd37461a26af76d34a6b29744a2cd1ec (patch) | |
tree | 2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /indra/newview/llpathfindingpathtool.h | |
parent | 1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff) | |
parent | eff9be530805298339f656f86a52ade9efeba779 (diff) |
merge up to 3.3.3-release + pathfinding
Diffstat (limited to 'indra/newview/llpathfindingpathtool.h')
-rw-r--r-- | indra/newview/llpathfindingpathtool.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h index 671f5bef95..8a79da43c9 100644 --- a/indra/newview/llpathfindingpathtool.h +++ b/indra/newview/llpathfindingpathtool.h @@ -98,6 +98,7 @@ private: bool isAnyPathToolModKeys(MASK pMask) const; bool isPointAModKeys(MASK pMask) const; bool isPointBModKeys(MASK pMask) const; + bool isCameraModKeys(MASK pMask) const; void getRayPoints(S32 pX, S32 pY, LLVector3 &pRayStart, LLVector3 &pRayEnd) const; void computeFinalPoints(S32 pX, S32 pY, MASK pMask); |