Skip to content
Snippets Groups Projects
Commit 4dc294e6 authored by Dmitry Oleshko's avatar Dmitry Oleshko
Browse files

fixed low bug (EXT-2552) Building of notification toast's panel produces a creation of dummy icon

removed commented code from XML file
removed from toast notify panel Icon member and a corresponding code

--HG--
branch : product-engine
parent 1ea7c51f
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,6 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL; ...@@ -48,7 +48,6 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL;
LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification) : LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification) :
LLToastPanel(notification), LLToastPanel(notification),
mTextBox(NULL), mTextBox(NULL),
mIcon(NULL),
mInfoPanel(NULL), mInfoPanel(NULL),
mControlPanel(NULL), mControlPanel(NULL),
mNumOptions(0), mNumOptions(0),
...@@ -58,7 +57,6 @@ mAddedDefaultBtn(false) ...@@ -58,7 +57,6 @@ mAddedDefaultBtn(false)
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_notification.xml"); LLUICtrlFactory::getInstance()->buildPanel(this, "panel_notification.xml");
mInfoPanel = getChild<LLPanel>("info_panel"); mInfoPanel = getChild<LLPanel>("info_panel");
mControlPanel = getChild<LLPanel>("control_panel"); mControlPanel = getChild<LLPanel>("control_panel");
mIcon = getChild<LLIconCtrl>("info_icon");
// customize panel's attributes // customize panel's attributes
// is it intended for displaying a tip // is it intended for displaying a tip
...@@ -94,26 +92,6 @@ mAddedDefaultBtn(false) ...@@ -94,26 +92,6 @@ mAddedDefaultBtn(false)
// preliminary adjust panel's layout // preliminary adjust panel's layout
mIsTip ? adjustPanelForTipNotice() : adjustPanelForScriptNotice(form); mIsTip ? adjustPanelForTipNotice() : adjustPanelForScriptNotice(form);
// choose a right icon
if (mIsTip)
{
// use the tip notification icon
mIcon->setValue("notify_tip_icon.tga");
LLRect icon_rect = mIcon->getRect();
icon_rect.setLeftTopAndSize(icon_rect.mLeft, getRect().getHeight() - VPAD, icon_rect.getWidth(), icon_rect.getHeight());
mIcon->setRect(icon_rect);
}
else if (mIsCaution)
{
// use the caution notification icon
mIcon->setValue("notify_caution_icon.tga");
}
else
{
// use the default notification icon
mIcon->setValue("notify_box_icon.tga");
}
// adjust text options according to the notification type // adjust text options according to the notification type
// add a caution textbox at the top of a caution notification // add a caution textbox at the top of a caution notification
if (mIsCaution && !mIsTip) if (mIsCaution && !mIsTip)
......
...@@ -73,7 +73,6 @@ class LLToastNotifyPanel: public LLToastPanel ...@@ -73,7 +73,6 @@ class LLToastNotifyPanel: public LLToastPanel
// panel elements // panel elements
LLTextBase* mTextBox; LLTextBase* mTextBox;
LLIconCtrl* mIcon;
LLPanel* mInfoPanel; // a panel, that contains an information LLPanel* mInfoPanel; // a panel, that contains an information
LLPanel* mControlPanel; // a panel, that contains buttons (if present) LLPanel* mControlPanel; // a panel, that contains buttons (if present)
......
...@@ -90,15 +90,4 @@ ...@@ -90,15 +90,4 @@
name="control_panel" name="control_panel"
top_pad="0"> top_pad="0">
</panel> </panel>
<!--
<icon
follows="left|top"
height="32"
image_name="notify_tip_icon.tga"
layout="topleft"
left="8"
mouse_opaque="false"
name="info_icon"
top="20"
width="32" /> -->
</panel> </panel>
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