diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-04-06 19:41:32 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-04-06 19:41:32 +0300 |
| commit | 5c5574c27dcd06e98306f70ff39dffd270f7f278 (patch) | |
| tree | ddafe46f8c95817a180e0c3f3ee5843647bd13f3 /indra | |
| parent | 306cec78aa3f58dfc264d794435aebd4c1b7d63f (diff) | |
| parent | b4c6510d05c8b9391fcd8d7da1954c2a4c4f7b67 (diff) | |
Merged in lindenlab/viewer-lynx
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 feadf5e3b6..407eaabcff 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 |