diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp
index 676124614..2391858a6 100644
--- a/indra/newview/llnotify.cpp
+++ b/indra/newview/llnotify.cpp
@@ -191,29 +191,12 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
 	setBackgroundVisible(FALSE);
 	setBackgroundOpaque(TRUE);
 
-	LLIconCtrl* icon;
-	LLTextEditor* text;
-
 	const S32 TOP = getRect().getHeight() - (mIsTip ? (S32)sFont->getLineHeight() : 32);
 	const S32 BOTTOM = (S32)sFont->getLineHeight();
 	S32 x = HPAD + HPAD;
 	S32 y = TOP;
 
-	if (mIsTip)
-	{
-		// use the tip notification icon
-		icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), std::string("notify_tip_icon.tga"));
-	}
-	else if (mIsCaution)
-	{
-		// use the caution notification icon
-		icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), std::string("notify_caution_icon.tga"));
-	}
-	else
-	{
-		// use the default notification icon
-		icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), std::string("notify_box_icon.tga"));
-	}
+	auto icon = new LLIconCtrl(std::string("icon"), LLRect(x, y, x+32, TOP-32), mIsTip ? "notify_tip_icon.tga" : mIsCaution ? "notify_caution_icon.tga" : "notify_box_icon.tga");
 
 	icon->setMouseOpaque(FALSE);
 	addChild(icon);
@@ -221,11 +204,10 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
 	x += HPAD + HPAD + 32;
 
 	// add a caution textbox at the top of a caution notification
-	LLTextBox* caution_box = NULL;
 	if (mIsCaution && !mIsTip)
 	{
 		S32 caution_height = ((S32)sFont->getLineHeight() * 2) + VPAD;
-		caution_box = new LLTextBox(
+		auto caution_box = new LLTextBox(
 			std::string("caution_box"), 
 			LLRect(x, y, getRect().getWidth() - 2, caution_height), 
 			LLStringUtil::null, 
@@ -244,16 +226,15 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
 		// it appears below the caution textbox
 		y = y - caution_height;
 	}
-	else if (mIsCaution && mIsTip)	
+	else
 	{
-
 		const S32 BTN_TOP = BOTTOM_PAD + (((mNumOptions-1+2)/3)) * (BTN_HEIGHT+VPAD);
 
 		// Tokenization on \n is handled by LLTextBox
 
 		const S32 MAX_LENGTH = 512 + 20 + DB_FIRST_NAME_BUF_SIZE + DB_LAST_NAME_BUF_SIZE + DB_INV_ITEM_NAME_BUF_SIZE;  // For script dialogs: add space for title.
 
-		text = new LLTextEditor(std::string("box"), LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16), MAX_LENGTH, message, sFont, FALSE);
+		auto text = new LLTextEditor(std::string("box"), LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16), MAX_LENGTH, message, sFont, FALSE);
 		text->setWordWrap(TRUE);
 		text->setTabStop(FALSE);
 		text->setMouseOpaque(FALSE);
@@ -263,37 +244,7 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
 		text->setReadOnlyBgColor ( LLColor4::transparent ); // the background color of the box is manually 
 															// rendered under the text box, therefore we want 
 															// the actual text box to be transparent
-		text->setReadOnlyFgColor ( gColors.getColor("NotifyCautionWarnColor") ); //sets caution text color for tip notifications
-		text->setEnabled(FALSE); // makes it read-only
-		text->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard)
-		addChild(text);
-	}
-	else
-	{
-		const S32 BTN_TOP = BOTTOM_PAD + (((mNumOptions-1+2)/3)) * (BTN_HEIGHT+VPAD);
-
-		// Tokenization on \n is handled by LLTextBox
-		const S32 MAX_LENGTH = 512 + 20 + 
-			DB_FIRST_NAME_BUF_SIZE + 
-			DB_LAST_NAME_BUF_SIZE +
-			DB_INV_ITEM_NAME_BUF_SIZE;  // For script dialogs: add space for title.
-
-		text = new LLTextEditor(std::string("box"),
-								LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16),
-								MAX_LENGTH,
-								message,
-								sFont,
-								FALSE);
-		text->setWordWrap(TRUE);
-		text->setTabStop(FALSE);
-		text->setMouseOpaque(FALSE);
-		text->setBorderVisible(FALSE);
-		text->setTakesNonScrollClicks(FALSE);
-		text->setHideScrollbarForShortDocs(TRUE);
-		text->setReadOnlyBgColor ( LLColor4::transparent ); // the background color of the box is manually 
-															// rendered under the text box, therefore we want 
-															// the actual text box to be transparent
-		text->setReadOnlyFgColor ( gColors.getColor("NotifyTextColor") );
+		text->setReadOnlyFgColor(gColors.getColor(mIsCaution && mIsTip ? "NotifyCautionWarnColor" : "NotifyTextColor")); //sets caution text color for tip notifications
 		text->setEnabled(FALSE); // makes it read-only
 		text->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard)
 		addChild(text);