diff options
| author | callum <none@none> | 2010-09-28 16:53:53 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-09-28 16:53:53 -0700 |
| commit | 30dd09b8aece5a2d2ba05c0b16565fade8d2ed39 (patch) | |
| tree | dfd2766368a888efd21bd1598fab5c9ceb41b0a9 /indra/newview | |
| parent | 95ecad54c6f037910a5a22f7ef30026cf628fe80 (diff) | |
| parent | ff071bbdce6478f8cd666ecf75658ca6e24f1140 (diff) | |
Merge with head.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaternotificationsconsole.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notification_visibility.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp index 42dc60f9e0..29af81d64c 100644 --- a/indra/newview/llfloaternotificationsconsole.cpp +++ b/indra/newview/llfloaternotificationsconsole.cpp @@ -174,6 +174,7 @@ BOOL LLFloaterNotificationConsole::postBuild() // these are in the order of processing addChannel("Unexpired"); addChannel("Ignore"); + addChannel("VisibilityRules"); addChannel("Visible", true); // all the ones below attach to the Visible channel addChannel("Persistent"); diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml new file mode 100644 index 0000000000..cb36890fe6 --- /dev/null +++ b/indra/newview/skins/default/xui/en/notification_visibility.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" ?> +<notification_visibility> + <rule visible="true"/> +</notification_visibility> + |