MAINT-3174 (When resident is sharing some item with you, there is no context menu in IM conversation.)
parent
5713e41e57
commit
e71e30aea0
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue