diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-19 13:58:19 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-19 13:58:19 -0700 |
| commit | 3e61b37258fc88916d45ee47a2a9fbb3baf934cf (patch) | |
| tree | 73aa2e6e90c4afe8221a977827532374db5a506f /indra/llui/llview.h | |
| parent | 11bad6f75cf380e94805c097e68b41259e7d7b4f (diff) | |
| parent | e2b0e8fb1c3f1bcde01e283d2e6fcfc6b2b315eb (diff) | |
hg merge
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 6d1dda90af..08828e55e6 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -565,7 +565,7 @@ protected: private: template <typename METHOD, typename XDATA> - LLView* childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra); + LLView* childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra, bool allow_mouse_block = true); template <typename METHOD, typename CHARTYPE> LLView* childrenHandleCharEvent(const std::string& desc, const METHOD& method, |