From ca067076c18b961ab68a0f1bb88ff252850181dd Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 26 Jun 2019 15:22:12 +0300
Subject: SL-11489 Add new "preexisting_tport" message to viewer

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f72767cceb..72efb4921a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2477,6 +2477,13 @@ Sorry, but the system was unable to complete your teleport request in a timely f
    type="alertmodal">
    <tag>fail</tag>
 Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="preexisting_tport"
+   type="alertmodal">
+   <tag>fail</tag>
+Sorry, but the system was unable to start your teleport. Please try again in a few minutes.
   </notification>
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From a28386b93472f7881b6d75a06f4ecf5fbd456a17 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 29 Jul 2019 17:42:44 +0300
Subject: SL-9189 Add ability to rename gesture in Gesture list

---
 .../newview/skins/default/xui/en/notifications.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 72efb4921a..efc68dbdf3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3098,6 +3098,29 @@ See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   label="Rename Gesture"
+   name="RenameGesture"
+   type="alertmodal">
+    New gesture name:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="new_name" type="text" width="300">
+        [NAME]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="RemoveFromFriends"
-- 
cgit v1.2.3


From b045831843ba81b54c46cc0b944c4481fec9f222 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 6 Aug 2019 21:31:14 +0300
Subject: SL-9815 An error prompts the user to teleport when they have no
 credencials set

---
 .../newview/skins/default/xui/en/notifications.xml | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index efc68dbdf3..30e8f7cedc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3575,6 +3575,30 @@ You can either check your Internet connection and try again in a few minutes, cl
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="LoginPacketNeverReceivedNoTP"
+   type="alertmodal">
+    <tag>fail</tag>
+We&apos;re having trouble connecting. There may be a problem with your Internet connection or the [SECOND_LIFE_GRID].
+
+You can either check your Internet connection and try again in a few minutes or click Help to view the [SUPPORT_SITE].
+    <url option="1" name="url">
+			http://secondlife.com/support/
+    </url>
+    <form name="form">
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Help"
+       text="Help"/>
+    </form>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="WelcomeChooseSex"
-- 
cgit v1.2.3


From 7ffe8d0a515f57b1127521f79cfefd0b5532f911 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 13 Nov 2019 05:32:05 +0200
Subject: SL-11964 Removed SL Share from the viewer

---
 indra/newview/skins/default/xui/en/notifications.xml | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 30e8f7cedc..af9602ea11 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6763,20 +6763,6 @@ Please select at least one type of content to search (General, Moderate, or Adul
 [MESSAGE]
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="FlickrConnect"
-   type="notifytip">
-    [MESSAGE]
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="TwitterConnect"
-   type="notifytip">
-    [MESSAGE]
-  </notification>
-
   <notification
    icon="notify.tga"
    name="PaymentReceived"
-- 
cgit v1.2.3