Skip to content
Snippets Groups Projects
Commit e71e30ae authored by MaximB ProductEngine's avatar MaximB ProductEngine
Browse files

MAINT-3174 (When resident is sharing some item with you, there is no context...

MAINT-3174 (When resident is sharing some item with you, there is no context menu in IM   conversation.)
parent 5713e41e
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "llnotificationsutil.h" #include "llnotificationsutil.h"
#include "llviewermessage.h" #include "llviewermessage.h"
#include "llfloaterimsession.h" #include "llfloaterimsession.h"
#include "llavataractions.h"
const S32 BOTTOM_PAD = VPAD * 3; const S32 BOTTOM_PAD = VPAD * 3;
const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding
...@@ -313,6 +314,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images ) ...@@ -313,6 +314,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
mTextBox->setVisible(TRUE); mTextBox->setVisible(TRUE);
mTextBox->setPlainText(!show_images); mTextBox->setPlainText(!show_images);
mTextBox->setValue(mNotification->getMessage()); mTextBox->setValue(mNotification->getMessage());
mTextBox->setIsFriendCallback(LLAvatarActions::isFriend);
// add buttons for a script notification // add buttons for a script notification
if (mIsTip) if (mIsTip)
......
...@@ -689,6 +689,11 @@ void LLViewerTextEditor::makePristine() ...@@ -689,6 +689,11 @@ void LLViewerTextEditor::makePristine()
LLTextEditor::makePristine(); LLTextEditor::makePristine();
} }
void LLViewerTextEditor::handleVisibilityChange( BOOL new_visibility )
{
LLUICtrl::handleVisibilityChange(new_visibility);
}
BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
{ {
BOOL handled = FALSE; BOOL handled = FALSE;
......
...@@ -46,6 +46,8 @@ class LLViewerTextEditor : public LLTextEditor ...@@ -46,6 +46,8 @@ class LLViewerTextEditor : public LLTextEditor
virtual ~LLViewerTextEditor(); virtual ~LLViewerTextEditor();
virtual void makePristine(); virtual void makePristine();
/*virtual*/ void handleVisibilityChange( BOOL new_visibility );
// mousehandler overrides // mousehandler overrides
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment