add a deque specifically for use with llmessagelogfilter apply to defeat iterator invalidation, replace crlf with lf

indra/newview/llfloaterexportregion.cpp

@@ -23,6 +23,10 @@ LLFloaterExportRegion::LLFloaterExportRegion(const LLSD& unused)
 {
 	sInstance = this;
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_export.xml");
+
+	//populate the list of objects to export
+	//int numOfObjects = gObjectList.getNumObjects();
+
 }
 
 

indra/newview/llfloatermessagelog.cpp

@@ -412,7 +412,9 @@ LLMessageLogFilterApply::LLMessageLogFilterApply()
 	mFinished(FALSE),
 	mProgress(0)
 {
-	mIter = LLFloaterMessageLog::sMessageLogEntries.begin();	
+	//make extra sure we don't invalidate any iterators and reserve a deque exclusively for our use
+	mFilterTempMessages = new std::deque <LLMessageLogEntry>(LLFloaterMessageLog::sMessageLogEntries);
+	mIter = mFilterTempMessages->begin();
 }
 void LLMessageLogFilterApply::cancel()
 {
@@ -420,7 +422,7 @@ void LLMessageLogFilterApply::cancel()
 }
 BOOL LLMessageLogFilterApply::tick()
 {
-	std::deque<LLMessageLogEntry>::iterator end = LLFloaterMessageLog::sMessageLogEntries.end();
+	std::deque<LLMessageLogEntry>::iterator end = mFilterTempMessages->end();
 	if(mIter == end || !LLFloaterMessageLog::sInstance)
 	{
 		mFinished = TRUE;
@@ -445,6 +447,9 @@ BOOL LLMessageLogFilterApply::tick()
 					LLFloaterMessageLog::sInstance->stopApplyingFilter();
 				}
 			}
+
+			delete mFilterTempMessages;
+
 			return TRUE;
 		}
 
@@ -686,8 +691,10 @@ void LLFloaterMessageLog::onLog(LLMessageLogEntry entry)
 {
 	sMessageLogEntries.push_back(entry);
 	if(!sBusyApplyingFilter)
+	{
 		conditionalLog(LLFloaterMessageLogItem(entry));
 	}
+}
 // static
 void LLFloaterMessageLog::conditionalLog(LLFloaterMessageLogItem item)
 {	

indra/newview/llfloatermessagelog.h

@@ -46,6 +46,7 @@ public:
 	S32 mProgress;
 	BOOL mFinished;
 private:
+	std::deque<LLMessageLogEntry> *mFilterTempMessages;
 	std::deque<LLMessageLogEntry>::iterator mIter;
 };
 class LLFloaterMessageLog : public LLFloater, public LLEventTimer