diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
| commit | 23f05269535d7c36806913244de419d7ab0b9f46 (patch) | |
| tree | 34c996678f96d1b0ad69cc64dbe39454dc516d69 /indra/llui/llview.h | |
| parent | 2a206cff7982db662c58436f870c6383b396d7df (diff) | |
| parent | f5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (diff) | |
merge changes for STORM-1661
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, |