diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:06:34 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:06:34 -0700 |
| commit | 0d5727814b5038b9deb3a635b9b0bd1e048763a3 (patch) | |
| tree | 6c6d301c260c00457690c57e6b0dfac05c497622 /indra/newview/skins/default | |
| parent | 0481494c2df074d2b548d6b80e595a208a2848c3 (diff) | |
| parent | 998bdf10cc738ee9799d985af80bbb8c51ef2054 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 55022d8c03..2e804c2404 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7129,7 +7129,7 @@ Scripts associated with this experience will be able to do the following on regi [QUESTIONS]Is this OK? - <unique combine="replace_with_new"> + <unique combine="combine_with_new"> <context>experience</context> </unique> <tag>confirm</tag> |