From 78eed3fc075049fa100ffe23ab508120977aaaed Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Fri, 30 Apr 2010 13:25:48 +0300 Subject: 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 --- indra/newview/skins/default/xui/en/strings.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default') 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. The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing. - (by name) + (By name) (Resident) - (object) - (group) + (Object) + (Group) + (External) There is no Covenant provided for this Estate. -- cgit v1.2.3