Skip to content
Snippets Groups Projects
Commit 9e49a530 authored by Andrew Dyukov's avatar Andrew Dyukov
Browse files

STORM-114 FIXED Removed showing of images inside notifications in IM in plaintext mode.

- Added argument show_images to constructors of LLIMToastNotifyPanel and LLToastNotifyPanel. Depending on it plaintext attribute for textbox with notification text is set. Used this argument when adding notification to chat history if IM is in plaintext mode.
parent 807aec7b
Branches
Tags
No related merge requests found
...@@ -760,7 +760,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL ...@@ -760,7 +760,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
if (notification != NULL) if (notification != NULL)
{ {
LLIMToastNotifyPanel* notify_box = new LLIMToastNotifyPanel( LLIMToastNotifyPanel* notify_box = new LLIMToastNotifyPanel(
notification, chat.mSessionID); notification, chat.mSessionID, LLRect::null, !use_plain_text_chat_history);
//we can't set follows in xml since it broke toasts behavior //we can't set follows in xml since it broke toasts behavior
notify_box->setFollowsLeft(); notify_box->setFollowsLeft();
notify_box->setFollowsRight(); notify_box->setFollowsRight();
......
...@@ -51,7 +51,7 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL; ...@@ -51,7 +51,7 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL;
LLToastNotifyPanel::button_click_signal_t LLToastNotifyPanel::sButtonClickSignal; LLToastNotifyPanel::button_click_signal_t LLToastNotifyPanel::sButtonClickSignal;
LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification, const LLRect& rect) : LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification, const LLRect& rect, bool show_images) :
LLToastPanel(notification), LLToastPanel(notification),
mTextBox(NULL), mTextBox(NULL),
mInfoPanel(NULL), mInfoPanel(NULL),
...@@ -120,6 +120,7 @@ mCloseNotificationOnDestroy(true) ...@@ -120,6 +120,7 @@ mCloseNotificationOnDestroy(true)
mTextBox->setMaxTextLength(MAX_LENGTH); mTextBox->setMaxTextLength(MAX_LENGTH);
mTextBox->setVisible(TRUE); mTextBox->setVisible(TRUE);
mTextBox->setPlainText(!show_images);
mTextBox->setValue(notification->getMessage()); mTextBox->setValue(notification->getMessage());
// add buttons for a script notification // add buttons for a script notification
...@@ -523,8 +524,9 @@ void LLToastNotifyPanel::disableRespondedOptions(LLNotificationPtr& notification ...@@ -523,8 +524,9 @@ void LLToastNotifyPanel::disableRespondedOptions(LLNotificationPtr& notification
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
LLIMToastNotifyPanel::LLIMToastNotifyPanel(LLNotificationPtr& pNotification, const LLUUID& session_id, const LLRect& rect /* = LLRect::null */) LLIMToastNotifyPanel::LLIMToastNotifyPanel(LLNotificationPtr& pNotification, const LLUUID& session_id, const LLRect& rect /* = LLRect::null */,
: mSessionID(session_id), LLToastNotifyPanel(pNotification, rect) bool show_images /* = true */)
: mSessionID(session_id), LLToastNotifyPanel(pNotification, rect, show_images)
{ {
mTextBox->setFollowsAll(); mTextBox->setFollowsAll();
} }
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
* @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to * @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to
* implement right class for desired toast panel. @see LLGenericTipPanel as example. * implement right class for desired toast panel. @see LLGenericTipPanel as example.
*/ */
LLToastNotifyPanel(LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null); LLToastNotifyPanel(LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null, bool show_images = true);
virtual ~LLToastNotifyPanel(); virtual ~LLToastNotifyPanel();
LLPanel * getControlPanel() { return mControlPanel; } LLPanel * getControlPanel() { return mControlPanel; }
...@@ -137,7 +137,7 @@ class LLIMToastNotifyPanel : public LLToastNotifyPanel ...@@ -137,7 +137,7 @@ class LLIMToastNotifyPanel : public LLToastNotifyPanel
{ {
public: public:
LLIMToastNotifyPanel(LLNotificationPtr& pNotification, const LLUUID& session_id, const LLRect& rect = LLRect::null); LLIMToastNotifyPanel(LLNotificationPtr& pNotification, const LLUUID& session_id, const LLRect& rect = LLRect::null, bool show_images = true);
~LLIMToastNotifyPanel(); ~LLIMToastNotifyPanel();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment