diff options
author | Lynx Linden <lynx@lindenlab.com> | 2009-11-10 18:53:07 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-10 18:53:07 +0000 |
commit | 162924aadfb6a7312287d91a25a129885239c0a4 (patch) | |
tree | 53a512ebede0358e4bc1a34cc88ae9591fc336ab /indra/newview/skins/default/xui | |
parent | 93adff4569d66d0a8699615b7a21d789921ca15c (diff) |
DEV-41317 DEV-42311: Added ad-hoc voice call support.
You can now multiple select users in the People panel, hit Call, and
start an ad-hoc voice conference call with those users.
The most difficult part here was automatically starting the call once
the conference chat panel popped up. We have to wait for the panel to
initialize before we can start a call, so I added another callback to
LLIMModel to enable us to get notified when the panel has initialized.
This is all wrapped up behind a new LLAvatarActions::startAdhocCall()
API.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c850dce141..b0a406a277 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2863,6 +2863,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="answering-im"> Connecting... </string> + <string name="conference-title"> + Friends Conference + </string> <string name="inventory_item_offered-im"> Inventory item offered </string> |