livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in lindenlab/viewer-lynx

master
AndreyL ProductEngine 2017-04-06 19:41:32 +03:00
parent 306cec78aa b4c6510d05
commit 5c5574c27d
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llagent.cpp
View File

@ -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

7
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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"