MAINT-3174 (When resident is sharing some item with you, there is no context menu in IM conversation.)

MaximB ProductEngine 2013-10-01 11:06:44 +03:00
parent 5713e41e57
commit e71e30aea0
3 changed files with 9 additions and 0 deletions

View File

@ -41,6 +41,7 @@
#include "llnotificationsutil.h"
#include "llviewermessage.h"
#include "llfloaterimsession.h"
#include "llavataractions.h"
const S32 BOTTOM_PAD = VPAD * 3;
const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding
@ -313,6 +314,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
mTextBox->setVisible(TRUE);
mTextBox->setPlainText(!show_images);
mTextBox->setValue(mNotification->getMessage());
mTextBox->setIsFriendCallback(LLAvatarActions::isFriend);
// add buttons for a script notification
if (mIsTip)

View File

@ -689,6 +689,11 @@ void LLViewerTextEditor::makePristine()
LLTextEditor::makePristine();
}
void LLViewerTextEditor::handleVisibilityChange( BOOL new_visibility )
{
LLUICtrl::handleVisibilityChange(new_visibility);
}
BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = FALSE;

View File

@ -46,6 +46,8 @@ public:
virtual ~LLViewerTextEditor();
virtual void makePristine();
/*virtual*/ void handleVisibilityChange( BOOL new_visibility );
// mousehandler overrides
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);