merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release

DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110  	 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files.  This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115  truncated word in the Advanced Water Editor's modal help dialog

1 files changed, 7 insertions, 6 deletions

diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index b9f2ef2ddf..ac41e02744 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -100,7 +100,7 @@ void LLUploadDialog::setMessage( const std::string& msg)
 
 	// Split message into lines, separated by '\n'
 	S32 max_msg_width = 0;
-	LLDoubleLinkedList<LLString> msg_lines;
+	std::list<std::string> msg_lines;
 
 	S32 size = msg.size() + 1;// + strlen("Uploading...\n\n");
 	char* temp_msg = new char[size];
@@ -118,7 +118,7 @@ void LLUploadDialog::setMessage( const std::string& msg)
 	{
 		S32 cur_width = S32(font->getWidth(token) + 0.99f) + TEXT_PAD;
 		max_msg_width = llmax( max_msg_width, cur_width );
-		msg_lines.addDataAtEnd( new LLString( token ) );
+		msg_lines.push_back( std::string( token ) );
 		token = strtok( NULL, "\n" );
 	}
 	delete[] temp_msg;
@@ -126,7 +126,7 @@ void LLUploadDialog::setMessage( const std::string& msg)
 
 	S32 line_height = S32( font->getLineHeight() + 0.99f );
 	S32 dialog_width = max_msg_width + 2 * HPAD;
-	S32 dialog_height = line_height * msg_lines.getLength() + 2 * VPAD;
+	S32 dialog_height = line_height * msg_lines.size() + 2 * VPAD;
 
 	reshape( dialog_width, dialog_height, FALSE );
 
@@ -139,18 +139,19 @@ void LLUploadDialog::setMessage( const std::string& msg)
 		mLabelBox[line_num]->setVisible(FALSE);
 	}
 	line_num = 0;
-	for( LLString* cur_line = msg_lines.getFirstData(); cur_line; cur_line = msg_lines.getNextData() )
+	for (std::list<std::string>::iterator iter = msg_lines.begin();
+		 iter != msg_lines.end(); ++iter)
 	{
+		std::string& cur_line = *iter;
 		LLRect msg_rect;
 		msg_rect.setOriginAndSize( msg_x, msg_y, max_msg_width, line_height );
 		mLabelBox[line_num]->setRect(msg_rect);
-		mLabelBox[line_num]->setText(*cur_line);
+		mLabelBox[line_num]->setText(cur_line);
 		mLabelBox[line_num]->setColor( gColors.getColor( "LabelTextColor" ) );
 		mLabelBox[line_num]->setVisible(TRUE);
 		msg_y -= line_height;
 		++line_num;
 	}
-	msg_lines.deleteAllData();
 
 	centerWithin(gViewerWindow->getRootView()->getRect());
 }