diff options
| author | callum <none@none> | 2011-10-20 17:31:01 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-20 17:31:01 -0700 |
| commit | 28f9d147e951965da38dd992a824c686ca364f59 (patch) | |
| tree | aee79ef68ea5539ecb3d8db0e043be88b64103a2 /indra/newview/skins/default | |
| parent | ade39d16f72ce80b61cadb45e244b40a9d55e7e6 (diff) | |
| parent | 27bfdfea1c3cb6945c4263f3e2eb73c3bc0d57a5 (diff) | |
Merge with head
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml index 80718584e3..cd0b59dc51 100644 --- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -10,7 +10,7 @@ name="floater_my_inventory" save_rect="true" save_visibility="true" - reuse_instance="false" + reuse_instance="true" title="INVENTORY" width="333" > <panel 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 14a722e3be..93a04050b6 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -52,6 +52,7 @@ user_resize="false" auto_resize="false" layout="topleft" + min_height="20" height="20" name="my_panel"> <avatar_icon @@ -133,6 +134,7 @@ height="132" name="callers_panel" user_resize="false" + auto_resize="true" width="280"> <avatar_list follows="all" diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml index 1f35cfaa27..6af1105400 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_item.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml @@ -22,6 +22,7 @@ text_color="white" word_wrap="true" mouse_opaque="true" + valign="bottom" name="msg_text"> </text_chat> </panel> |