summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-12 10:58:04 -0800
committerrichard <none@none>2010-01-12 10:58:04 -0800
commit00c850386c806a68eb74c3b637c3ffe5621bb260 (patch)
treeef252c44eb1a90bf1440304e0d170f64816c6d36 /indra/newview/skins
parente9e651f5e4cf5dea29cf3f0340663ab404a46bcd (diff)
parent2d9d3d5d8653176b82578578c8c44769a03b102d (diff)
merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml9
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c4a51bcff0..c438d28236 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,9 +3,9 @@
can_resize="true"
can_minimize="true"
can_close="false"
- height="270"
+ height="275"
layout="topleft"
- min_height="280"
+ min_height="100"
min_width="190"
name="floater_voice_controls"
help_topic="floater_voice_controls"
@@ -33,10 +33,6 @@
name="no_one_near">
No one near has voice enabled
</string>
- <string
- name="max_visible_items">
- 5
- </string>
<layout_stack
clip="false"
follows="all"
@@ -126,6 +122,7 @@
follows="left|right|top"
height="24"
layout="topleft"
+ background_visible="false"
left="0"
name="non_avatar_caller"
top="10"