Skip to content
Snippets Groups Projects
Commit 205d487f authored by Kitty Barnett's avatar Kitty Barnett
Browse files

- fixed : region "alerts" aren't show location or show names filtered

--HG--
branch : RLVa
parent 22e5f0db
No related branches found
No related tags found
No related merge requests found
...@@ -6003,6 +6003,15 @@ void process_alert_core(const std::string& message, BOOL modal) ...@@ -6003,6 +6003,15 @@ void process_alert_core(const std::string& message, BOOL modal)
else else
{ {
std::string new_msg =LLNotifications::instance().getGlobalString(text); std::string new_msg =LLNotifications::instance().getGlobalString(text);
// [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5
if ( (new_msg == text) && (rlv_handler_t::isEnabled()) )
{
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
RlvUtil::filterLocation(new_msg);
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
RlvUtil::filterNames(new_msg);
}
// [/RLVa:KB]
args["MESSAGE"] = new_msg; args["MESSAGE"] = new_msg;
LLNotificationsUtil::add("SystemMessage", args); LLNotificationsUtil::add("SystemMessage", args);
} }
...@@ -6011,6 +6020,15 @@ void process_alert_core(const std::string& message, BOOL modal) ...@@ -6011,6 +6020,15 @@ void process_alert_core(const std::string& message, BOOL modal)
{ {
LLSD args; LLSD args;
std::string new_msg =LLNotifications::instance().getGlobalString(message); std::string new_msg =LLNotifications::instance().getGlobalString(message);
// [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5
if ( (new_msg == message) && (rlv_handler_t::isEnabled()) )
{
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
RlvUtil::filterLocation(new_msg);
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
RlvUtil::filterNames(new_msg);
}
// [/RLVa:KB]
args["ERROR_MESSAGE"] = new_msg; args["ERROR_MESSAGE"] = new_msg;
LLNotificationsUtil::add("ErrorMessage", args); LLNotificationsUtil::add("ErrorMessage", args);
} }
...@@ -6026,6 +6044,16 @@ void process_alert_core(const std::string& message, BOOL modal) ...@@ -6026,6 +6044,16 @@ void process_alert_core(const std::string& message, BOOL modal)
std::string localized_msg; std::string localized_msg;
bool is_message_localized = LLTrans::findString(localized_msg, new_msg); bool is_message_localized = LLTrans::findString(localized_msg, new_msg);
// [RLVa:KB] - Checked: 2012-02-07 (RLVa-1.4.5) | Added: RLVa-1.4.5
if ( (new_msg == message) && (rlv_handler_t::isEnabled()) )
{
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
RlvUtil::filterLocation(new_msg);
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
RlvUtil::filterNames(new_msg);
}
// [/RLVa:KB]
args["MESSAGE"] = is_message_localized ? localized_msg : new_msg; args["MESSAGE"] = is_message_localized ? localized_msg : new_msg;
LLNotificationsUtil::add("SystemMessageTip", args); LLNotificationsUtil::add("SystemMessageTip", args);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment