summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-04-30 13:25:48 +0300
committerMike Antipov <mantipov@productengine.com>2010-04-30 13:25:48 +0300
commit78eed3fc075049fa100ffe23ab508120977aaaed (patch)
treed782f0a3c61e2fdcce36e3468b38e1238c9a0830 /indra/newview/skins
parent85e3432579844afa8f76b4071329264f85711507 (diff)
WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected via PSTN bridge)
Applyied Aimee's patch to enable blocking of avaline caller: added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions. The caller's ID will change each time so there's no point cluttering up the mute list by persisting them. Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list, so that will need changing to "Avaline Caller 1" etc --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3cba76cbfa..74dc23853d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2149,10 +2149,11 @@ Clears (deletes) the media and all params from the given face.
<string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
<!-- Mute -->
- <string name="MuteByName">(by name)</string>
+ <string name="MuteByName">(By name)</string>
<string name="MuteAgent">(Resident)</string>
- <string name="MuteObject">(object)</string>
- <string name="MuteGroup">(group)</string>
+ <string name="MuteObject">(Object)</string>
+ <string name="MuteGroup">(Group)</string>
+ <string name="MuteExternal">(External)</string>
<!-- Region/Estate Covenant -->
<string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string>