Merge branch 'master' into DRTVWR-513-maint

# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp

1 files changed, 2 insertions, 21 deletions

diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 870e0d94f0..bf56a10d4d 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -612,11 +612,8 @@ S32	LLToast::notifyParent(const LLSD& info)
 //static
 void LLToast::updateClass()
 {
-	for (LLInstanceTracker<LLToast>::instance_iter iter = LLInstanceTracker<LLToast>::beginInstances(); 
-			iter != LLInstanceTracker<LLToast>::endInstances(); ) 
+	for (auto& toast : LLInstanceTracker<LLToast>::instance_snapshot())
 	{
-		LLToast& toast = *iter++;
-		
 		toast.updateHoveredState();
 	}
 }
@@ -624,22 +621,6 @@ void LLToast::updateClass()
 // static 
 void LLToast::cleanupToasts()
 {
-	LLToast * toastp = NULL;
-
-	while (LLInstanceTracker<LLToast>::instanceCount() > 0)
-	{
-		{	// Need to scope iter to allow deletion
-			LLInstanceTracker<LLToast>::instance_iter iter = LLInstanceTracker<LLToast>::beginInstances(); 
-			toastp = &(*iter);
-		}
-
-		//LL_INFOS() << "Cleaning up toast id " << toastp->getNotificationID() << LL_ENDL;
-
-		// LLToast destructor will remove it from the LLInstanceTracker.
-		if (!toastp)
-			break;		// Don't get stuck in the loop if a null pointer somehow got on the list
-
-		delete toastp;
-	}
+	LLInstanceTracker<LLToast>::instance_snapshot().deleteAll();
 }