Commits

Kent Quirk  committed c0e17d9

Fix for EXT-3818 -- back out some code that was put in for EXT-6373, but overreached.

  • Participants
  • Parent commits 30ed4eb

Comments (0)

Files changed (3)

File indra/newview/llchathistory.cpp

 :	LLUICtrl(p),
 	mMessageHeaderFilename(p.message_header),
 	mMessageSeparatorFilename(p.message_separator),
-	mMessagePlaintextSeparatorFilename(p.message_plaintext_separator),
 	mLeftTextPad(p.left_text_pad),
 	mRightTextPad(p.right_text_pad),
 	mLeftWidgetPad(p.left_widget_pad),
 	return separator;
 }
 
-LLView* LLChatHistory::getPlaintextSeparator()
-{
-	LLPanel* separator = LLUICtrlFactory::getInstance()->createFromFile<LLPanel>(mMessagePlaintextSeparatorFilename, NULL, LLPanel::child_registry_t::instance());
-	return separator;
-}
-
 LLView* LLChatHistory::getHeader(const LLChat& chat,const LLStyle::Params& style_params)
 {
 	LLChatHistoryHeader* header = LLChatHistoryHeader::createInstance(mMessageHeaderFilename);
 
 	if (use_plain_text_chat_history)
 	{
-		// append plaintext separator
-		LLView* separator = getPlaintextSeparator();
-		LLInlineViewSegment::Params p;
-		p.force_newline = true;
-		p.left_pad = mLeftWidgetPad;
-		p.right_pad = mRightWidgetPad;
-		p.view = separator;
-		mEditor->appendWidget(p, "\n", false);
-
 		mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, style_params);
 
 		if (utf8str_trim(chat.mFromName).size() != 0)

File indra/newview/llchathistory.h

 			Optional<std::string>	message_header;
 			//Message separator filename
 			Optional<std::string>	message_separator;
-			//Message plaintext  separator filename
-			Optional<std::string>	message_plaintext_separator;
 			//Text left padding from the scroll rect
 			Optional<S32>			left_text_pad;
 			//Text right padding from the scroll rect
 			Params()
 			:	message_header("message_header"),
 				message_separator("message_separator"),
-				message_plaintext_separator("message_plaintext_separator"),
 				left_text_pad("left_text_pad"),
 				right_text_pad("right_text_pad"),
 				left_widget_pad("left_widget_pad"),
 		 */
 		LLView* getSeparator();
 		/**
-		 * Builds a message plaintext  separator.
-		 * @return pointer to LLView separator object.
-		 */
-		LLView* getPlaintextSeparator();
-		/**
 		 * Builds a message header.
 		 * @return pointer to LLView header object.
 		 */
 
 		std::string mMessageHeaderFilename;
 		std::string mMessageSeparatorFilename;
-		std::string mMessagePlaintextSeparatorFilename;
 
 		S32 mLeftTextPad;
 		S32 mRightTextPad;

File indra/newview/skins/default/xui/en/widgets/chat_history.xml

 <chat_history
   message_header="panel_chat_header.xml"
   message_separator="panel_chat_separator.xml"
-  message_plaintext_separator="panel_chat_plaintext_separator.xml"
   left_text_pad="10"
   right_text_pad="15"
   left_widget_pad="0"