summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-04-14 12:17:47 +0300
committerMike Antipov <mantipov@productengine.com>2010-04-14 12:17:47 +0300
commit5e34a91ce65bbd74834ae012552b3ebe8592fe9a (patch)
tree1c404cc87f98f2788516792968df484910dbf0d9 /indra/newview/skins/default
parent93317037ee4ed4aa7155ae9253800f8977224f73 (diff)
Fixed normal bug EXT-4301 (PDD: Dial-in to a PSTN bridge shows "(???) (???)" for the name.)
* Implementation notes: ** special item is cloned from VCP to be used in LLAvatarList to reflect an Avaline caller. ** LLAvatarList extended to create instances of Avaline Caller ** Participant list now determines type of adding session participant (Avatar/Avaline Caller) and selects a way item will be created in avatar list * Implementation behavior: ** The problem is when Avaline caller ends a call it is removed from Voice Client session but still exists in LLSpeakerMgr. Server does not send such information. HUCK was implemented to notify subscribers that Avaline callers are not anymore in the voice call. ** For now Avaline Caller is removed from the LLSpeakerMgr List when it is removed from the Voice Client session. This happens in two cases: if Avaline Caller ends call itself or if Resident ends group call. ** If Resident joins group call where Avaline caller already exists that caller will appear in Resident's viewer (VCP & Group IM window) ** The callers are displayed as "AvaLine Caller 1", "AvaLine Caller 2" etc. * Known issues: ** LLNonAvatarCaller should be removed from VCP (for avaline p2p calls). Updated Avatar & Participant Lists can be used instead of it. Separate ticket will be opened to refactor this code. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b0bf51c214..813f59ff89 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,6 +148,8 @@
<!-- Group name: text shown for LLUUID::null -->
<string name="GroupNameNone">(none)</string>
+ <string name="AvalineCaller">Avaline Caller [ORDER]</string>
+
<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
<string name="AssetErrorNone">No error</string>
<string name="AssetErrorRequestFailed">Asset request: failed</string>