From 205d487f6ceb0c2780d26de35cbf2debd06238ea Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Tue, 7 Feb 2012 01:23:33 +0100
Subject: [PATCH] - fixed : region "alerts" aren't show location or show names
filtered
--HG--
branch : RLVa
---
indra/newview/llviewermessage.cpp | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 26c3baec94d..5df69dfd582 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6003,6 +6003,15 @@ void process_alert_core(const std::string& message, BOOL modal)
else
{
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;
LLNotificationsUtil::add("SystemMessage", args);
}
@@ -6011,6 +6020,15 @@ void process_alert_core(const std::string& message, BOOL modal)
{
LLSD args;
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;
LLNotificationsUtil::add("ErrorMessage", args);
}
@@ -6026,6 +6044,16 @@ void process_alert_core(const std::string& message, BOOL modal)
std::string localized_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;
LLNotificationsUtil::add("SystemMessageTip", args);
}
--
GitLab