Merge with head

1 files changed, 31 insertions, 1 deletions

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index de14391d1f..7e235997d8 100755
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -678,7 +678,7 @@ void LLNotification::respond(const LLSD& response)
 		// and then call it
 		functor(asLLSD(), response);
 	}
-	else
+	else if (mCombinedNotifications.empty())
 	{
 		// no registered responder
 		return;
@@ -700,6 +700,14 @@ void LLNotification::respond(const LLSD& response)
 		}
 	}
 
+	for (std::vector<LLNotificationPtr>::const_iterator it = mCombinedNotifications.begin(); it != mCombinedNotifications.end(); ++it)
+	{
+		if ((*it))
+		{
+			(*it)->respond(response);
+		}
+	}
+
 	update();
 }
 
@@ -1322,6 +1330,28 @@ bool LLNotifications::failedUniquenessTest(const LLSD& payload)
 			}
 		}
 		break;
+	case  LLNotification::COMBINE_WITH_NEW:
+		// Add to the existing unique notification with the data from this particular instance...
+		// This guarantees that duplicate notifications will be collapsed to the one
+		// most recently triggered
+		for (LLNotificationMap::iterator existing_it = mUniqueNotifications.find(pNotif->getName());
+			existing_it != mUniqueNotifications.end();
+			++existing_it)
+		{
+			LLNotificationPtr existing_notification = existing_it->second;
+			if (pNotif != existing_notification 
+				&& pNotif->isEquivalentTo(existing_notification))
+			{
+				// copy the notifications from the newest instance into the oldest
+				existing_notification->mCombinedNotifications.push_back(pNotif);
+				existing_notification->mCombinedNotifications.insert(existing_notification->mCombinedNotifications.end(),
+					pNotif->mCombinedNotifications.begin(), pNotif->mCombinedNotifications.end());
+
+				// pop up again
+				existing_notification->update();
+			}
+		}
+		break;
 	case LLNotification::KEEP_OLD:
 		break;
 	case LLNotification::CANCEL_OLD: