diff options
| author | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-14 17:52:41 -0700 |
| commit | 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch) | |
| tree | 0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/lltoolface.cpp | |
| parent | Applied BlockClickSit debug setting from Emerald to block sit click action (diff) | |
| download | meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2 meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz | |
Merged in jacek/next
Diffstat (limited to 'linden/indra/newview/lltoolface.cpp')
| -rw-r--r-- | linden/indra/newview/lltoolface.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp index d5e4f81..41f2b0d 100644 --- a/linden/indra/newview/lltoolface.cpp +++ b/linden/indra/newview/lltoolface.cpp | |||
| @@ -99,6 +99,16 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info) | |||
| 99 | return; | 99 | return; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f | ||
| 103 | if ( (rlv_handler_t::isEnabled()) && | ||
| 104 | ( (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) || | ||
| 105 | ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && ((!hit_obj->isAttachment()) || (!hit_obj->permYouOwner())) && | ||
| 106 | (dist_vec_squared(gAgent.getPositionAgent(), hit_obj->getPositionRegion() + pick_info.mObjectOffset) > 1.5f * 1.5f) ))) | ||
| 107 | { | ||
| 108 | return; | ||
| 109 | } | ||
| 110 | // [/RLVa:KB] | ||
| 111 | |||
| 102 | // ...clicked on a world object, try to pick the appropriate face | 112 | // ...clicked on a world object, try to pick the appropriate face |
| 103 | 113 | ||
| 104 | if (pick_info.mKeyMask & MASK_SHIFT) | 114 | if (pick_info.mKeyMask & MASK_SHIFT) |