diff options
author | callum <none@none> | 2010-10-04 17:40:59 -0700 |
---|---|---|
committer | callum <none@none> | 2010-10-04 17:40:59 -0700 |
commit | 21c8dea4e460939aae0767e791f3efed03dc91b3 (patch) | |
tree | fee1d569617bbe97a2e492a73deae7383da65868 /indra/llui/llnotifications.cpp | |
parent | 89efb318141bb504597e525f186ea1a43502eac4 (diff) | |
parent | 7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (diff) |
Test merge
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rw-r--r-- | indra/llui/llnotifications.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 5b2e7590b1..92fa6ada54 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1404,7 +1404,7 @@ bool LLNotifications::loadTemplates() LLNotificationTemplate::Notifications params; LLXUIParser parser; parser.readXUI(root, params, full_filename); - + if(!params.validateBlock()) { llerrs << "Problem reading UI Notifications file: " << full_filename << llendl; @@ -1645,7 +1645,7 @@ bool LLNotifications::getIgnoreAllNotifications() { return mIgnoreAllNotifications; } - + bool LLNotifications::isVisibleByRules(LLNotificationPtr n) { if(n->isRespondedTo()) |