diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2017-04-03 20:25:51 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2017-04-03 20:25:51 +0300 |
| commit | b4c6510d05c8b9391fcd8d7da1954c2a4c4f7b67 (patch) | |
| tree | 4a735b04a64216deec65a2c8d50281ec57eb786e /indra | |
| parent | d5200f05786dff77b442283a2497b6ad5df334a9 (diff) | |
MAINT-7162 Forced sit on a physical object triggers a bogus "Cancelled Sit" message
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
2 files changed, 1 insertions, 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 @@ -6392,13 +6392,6 @@ Cancelled <notification icon="notifytip.tga" - name="CancelledSit" - type="notifytip"> -Cancelled Sit - </notification> - - <notification - icon="notifytip.tga" name="CancelledAttach" type="notifytip"> Cancelled Attach |