diff options
| author | Dmitry Oleshko <doleshko@productengine.com> | 2009-11-18 18:36:10 +0200 | 
|---|---|---|
| committer | Dmitry Oleshko <doleshko@productengine.com> | 2009-11-18 18:36:10 +0200 | 
| commit | 4dc294e6dc6a88201ccb2dce76eab25ca936e062 (patch) | |
| tree | 619ad963e2a19b5ada99e21f1a86c0b5139da70b /indra/newview/lltoastnotifypanel.cpp | |
| parent | 1ea7c51f7e3f012916c1f5e76100b9686ee3d35b (diff) | |
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
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 22 | 
1 files changed, 0 insertions, 22 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)  | 
