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

3 files changed, 0 insertions, 34 deletions

diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 48b68e4292..699424ef36 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -48,7 +48,6 @@ const LLFontGL* LLToastNotifyPanel::sFontSmall = NULL;
 LLToastNotifyPanel::LLToastNotifyPanel(LLNotificationPtr& notification) : 
 LLToastPanel(notification),
 mTextBox(NULL),
-mIcon(NULL),
 mInfoPanel(NULL),
 mControlPanel(NULL),
 mNumOptions(0),
@@ -58,7 +57,6 @@ mAddedDefaultBtn(false)
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_notification.xml");
 	mInfoPanel = getChild<LLPanel>("info_panel");
 	mControlPanel = getChild<LLPanel>("control_panel");
-	mIcon = getChild<LLIconCtrl>("info_icon");
 
 	// customize panel's attributes
 	// is it intended for displaying a tip
@@ -94,26 +92,6 @@ mAddedDefaultBtn(false)
 	// preliminary adjust panel's layout
 	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
 	// add a caution textbox at the top of a caution notification
 	if (mIsCaution && !mIsTip)
diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h
index 66534edcdf..eea70705ec 100644
--- a/indra/newview/lltoastnotifypanel.h
+++ b/indra/newview/lltoastnotifypanel.h
@@ -73,7 +73,6 @@ private:
 
 	// panel elements
 	LLTextBase*		mTextBox;
-	LLIconCtrl*		mIcon;
 	LLPanel*		mInfoPanel;		// a panel, that contains an information
 	LLPanel*		mControlPanel;	// a panel, that contains buttons (if present)
 
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 462188ee24..df37f9973c 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -90,15 +90,4 @@
     name="control_panel"
     top_pad="0">
   </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>