diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llchatitemscontainerctrl.cpp | |
parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
parent | e3344abb95802646912f357d214538966f3f2357 (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
-rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index f7f7ee83af..f772aea4bd 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -258,8 +258,12 @@ BOOL LLNearbyChatToastPanel::handleMouseDown (S32 x, S32 y, MASK mask) BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) { + /* + fix for request EXT-4780 + leaving this commented since I don't remember why ew block those messages... if(mSourceType != CHAT_SOURCE_AGENT) return LLPanel::handleMouseUp(x,y,mask); + */ LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false); S32 local_x = x - text_box->getRect().mLeft; |