summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcallum <none@none>2011-05-06 13:39:27 -0700
committercallum <none@none>2011-05-06 13:39:27 -0700
commit4ad94507dd17602323fa19027ff5bb5bfc6bc020 (patch)
treeeb10c2ee670d8705eb4480ce48e614c655d3da71
parentf0d095086ff5bf2c231bee06064a89a8b6ef4a9b (diff)
EXP-623 (SUPPLEMENTAL FIX) Selecting fly option while on click to walk path
flys avatar to end point but avatar spins and shakes when arriving at click point.
-rw-r--r--indra/newview/llviewermessage.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3f018fc57c..ef5968a5e2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5522,14 +5522,19 @@ void process_alert_core(const std::string& message, BOOL modal)
}
else
{
- LLSD args;
- std::string new_msg =LLNotifications::instance().getGlobalString(message);
+ // Hack fix for EXP-623 (blame fix on RN :)) to avoid a sim deploy
+ const std::string AUTOPILOT_CANCELED_MSG("Autopilot canceled");
+ if (message.find(AUTOPILOT_CANCELED_MSG) == std::string::npos )
+ {
+ LLSD args;
+ std::string new_msg =LLNotifications::instance().getGlobalString(message);
- std::string localized_msg;
- bool is_message_localized = LLTrans::findString(localized_msg, new_msg);
+ std::string localized_msg;
+ bool is_message_localized = LLTrans::findString(localized_msg, new_msg);
- args["MESSAGE"] = is_message_localized ? localized_msg : new_msg;
- LLNotificationsUtil::add("SystemMessageTip", args);
+ args["MESSAGE"] = is_message_localized ? localized_msg : new_msg;
+ LLNotificationsUtil::add("SystemMessageTip", args);
+ }
}
}