From b4c6510d05c8b9391fcd8d7da1954c2a4c4f7b67 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 3 Apr 2017 20:25:51 +0300
Subject: MAINT-7162 Forced sit on a physical object triggers a bogus
 "Cancelled Sit" message

---
 indra/newview/llagent.cpp                            | 2 +-
 indra/newview/skins/default/xui/en/notifications.xml | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7d0d39e22a..8dd0b06ed2 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1644,7 +1644,7 @@ void LLAgent::stopAutoPilot(BOOL user_cancel)
 		if (user_cancel && !mAutoPilotBehaviorName.empty())
 		{
 			if (mAutoPilotBehaviorName == "Sit")
-				LLNotificationsUtil::add("CancelledSit");
+				LL_INFOS("Agent") << "Autopilot-Sit was canceled by user action" << LL_ENDL;
 			else if (mAutoPilotBehaviorName == "Attach")
 				LLNotificationsUtil::add("CancelledAttach");
 			else
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3fcd91f89b..4f5f0ac02c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6390,13 +6390,6 @@ The string [STRING_NAME] is missing from strings.xml
 Cancelled
   </notification>
 
-  <notification
-   icon="notifytip.tga"
-   name="CancelledSit"
-   type="notifytip">
-Cancelled Sit
-  </notification>
-
   <notification
    icon="notifytip.tga"
    name="CancelledAttach"
-- 
cgit v1.2.3