From c3f03b6bbf97aa679005e5c070cc4988f3e1e261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Fri, 10 Jan 2020 03:11:19 -0500
Subject: [PATCH] [Follow] Specify that Follow has been cancelled, with
 Cancelled notice

---
 indra/newview/llagent.cpp                               | 2 ++
 indra/newview/skins/default/xui/en-us/notifications.xml | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 31815f908..1a384b8f2 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1741,6 +1741,8 @@ void LLAgent::stopAutoPilot(BOOL user_cancel)
 				LLNotificationsUtil::add("CancelledSit");
 			else if (mAutoPilotBehaviorName == "Attach")
 				LLNotificationsUtil::add("CancelledAttach");
+			else if (mAutoPilotBehaviorName == "Follow")
+				LLNotificationsUtil::add("CancelledFollow");
 			else
 				LLNotificationsUtil::add("Cancelled");
 		}
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 99dab549c..dae28cc5f 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6529,6 +6529,13 @@ Cancelled Sit
 Cancelled Attach
   </notification>
 
+  <notification
+   icon="notifytip.tga"
+   name="CancelledFollow"
+   type="notifytip">
+Cancelled Follow
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="ReplacedMissingWearable"