diff options
| author | Richard Linden <none@none> | 2012-04-24 17:10:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-24 17:10:43 -0700 |
| commit | 5955e6260e6e263fb089f7cc91c0be482cccdfb8 (patch) | |
| tree | a687fe47b0719b734bad9d49e294753f9af3cdfd /indra | |
| parent | 9b77ffb71ba112d27296b7ce8ab571285b9bba06 (diff) | |
CHUI-106 FIX Notifications like Friends online are shown in local chat history - no toast given if chat history is open
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llnotificationtemplate.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h index 8080acbf87..f7d08ae1f4 100644 --- a/indra/llui/llnotificationtemplate.h +++ b/indra/llui/llnotificationtemplate.h @@ -206,7 +206,7 @@ struct LLNotificationTemplate : name("name"), persist("persist", false), log_to_im("log_to_im", false), - log_to_chat("log_to_chat", false), + log_to_chat("log_to_chat", true), functor("functor"), icon("icon"), label("label"), diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index da83ffbab4..73ec6ffdb3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5164,7 +5164,7 @@ The string [STRING_NAME] is missing from strings.xml icon="notifytip.tga" name="IMSystemMessageTip" log_to_im="true" - log_to_chat="true" + log_to_chat="false" type="notifytip"> [MESSAGE] </notification> @@ -5209,7 +5209,7 @@ Topic: [SUBJECT], Message: [MESSAGE] <notification icon="notifytip.tga" name="FriendOnline" - log_to_chat="true" + log_to_chat="false" type="notifytip"> <tag>friendship</tag> <nolink>[NAME]</nolink> is Online @@ -5218,7 +5218,7 @@ Topic: [SUBJECT], Message: [MESSAGE] <notification icon="notifytip.tga" name="FriendOffline" - log_to_chat="true" + log_to_chat="false" type="notifytip"> <tag>friendship</tag> <nolink>[NAME]</nolink> is Offline @@ -5466,7 +5466,7 @@ You don't have permission to copy this. icon="notifytip.tga" name="InventoryAccepted" log_to_im="true" - log_to_chat="true" + log_to_chat="false" type="notifytip"> [NAME] received your inventory offer. </notification> @@ -5475,7 +5475,7 @@ You don't have permission to copy this. icon="notifytip.tga" name="InventoryDeclined" log_to_im="true" - log_to_chat="true" + log_to_chat="false" type="notifytip"> [NAME] declined your inventory offer. </notification> |