EXP-1959: Marking the teleport entry access notifications as unique so they do not stack.

2 files changed, 15 insertions, 1 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 1767522255..347cde6975 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3898,7 +3898,6 @@ void LLAgent::handleTeleportFinished()
 
 void LLAgent::handleTeleportFailed()
 {
-	llassert(mTeleportRequest != NULL);
 	if (mTeleportRequest != NULL)
 	{
 		mTeleportRequest->setStatus(LLTeleportRequest::kFailed);
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2376365505..588ab8d386 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4156,6 +4156,9 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
    icon="alertmodal.tga"
    name="TeleportEntryAccessBlocked_AdultsOnlyContent"
    type="alertmodal">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
     <tag>fail</tag>
     <tag>confirm</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
@@ -4173,6 +4176,9 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
    icon="notifytip.tga"
    name="TeleportEntryAccessBlocked_Notify"
    type="notifytip">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
     <tag>fail</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
   </notification>
@@ -4181,6 +4187,9 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
    icon="notifytip.tga"
    name="TeleportEntryAccessBlocked_NotifyAdultsOnly"
    type="notifytip">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
     <tag>fail</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
   </notification>
@@ -4189,6 +4198,9 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
    icon="alertmodal.tga"
    name="TeleportEntryAccessBlocked_ChangeAndReTeleport"
    type="alertmodal">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
     <tag>fail</tag>
     <tag>confirm</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences and continue with the teleport, or you can cancel this teleport.
@@ -4210,6 +4222,9 @@ The region you're trying to visit contains [REGIONMATURITY] content, but your cu
    icon="alertmodal.tga"
    name="TeleportEntryAccessBlocked_Change"
    type="alertmodal">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
     <tag>fail</tag>
     <tag>confirm</tag>
     The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, or you can cancel the teleport. After your preferences are changed, you will need to attempt the teleport again.