diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-26 18:56:19 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-26 18:56:19 +0200 |
| commit | 70e6b5a7f7027b7f9c005ca1ce43601f953dc951 (patch) | |
| tree | 561a4c63ee5f5199af74000a13b53f5622e1b256 /indra/newview/skins/default | |
| parent | c3f2859c9f91d0c26c256b498c29da624afb8fb9 (diff) | |
Fixed low bug EXT-3684 ("Default" icon is used always for group calls in the voice notifications instead of group icon)
-- implemented LLGroupIconCtrl to show group icon for passed group UUID.
-- added LLGroupIconCtrl to incoming and outgoing dialogs
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index b9ce11600f..1d67123726 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -43,6 +43,13 @@ left_delta="19" top="35" width="36" /> + <group_icon + enabled="false" + follows="left|top" + height="36" + layout="topleft" + top="35" + width="36" /> <text clip_partial="true" font="SansSerifLarge" diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml index 104ac2143f..eb772cc0bd 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -39,6 +39,13 @@ left_delta="19" top="35" width="36" /> + <group_icon + enabled="false" + follows="left|top" + height="36" + layout="topleft" + top="35" + width="36" /> <text font="SansSerifLarge" height="20" diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml new file mode 100644 index 0000000000..58d5e19fcc --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<group_icon + default_icon_name="Generic_Group" + image_name="Generic_Group" + name="group_icon" /> |