diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
| commit | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (patch) | |
| tree | 2ed65f1dd0a8404eda670cf1fe2e37769758f74a /indra/newview/skins/default | |
| parent | b2b980d6979b10a08b56c10b71c12ae4f9e6ff59 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_general.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 2243df951e..03e2d35b9f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -2,7 +2,7 @@ <panel border="true" follows="all" - height="470" + height="445" label="General" class="panel_group_general" layout="topleft" @@ -43,14 +43,14 @@ Hover your mouse over the options for more help. <text_editor type="string" follows="left|top" - left="95" + left="5" height="75" hide_scrollbar="true" layout="topleft" max_length="511" name="charter" - top="30" - width="170" + top="5" + width="260" word_wrap="true"> Group Charter </text_editor> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 65d1e3c3a7..2de41a9ee6 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -44,10 +44,10 @@ height="113" label="" layout="topleft" - left_delta="-10" + left="10" name="insignia" tool_tip="Click to choose a picture" - top_pad="5" + top_pad="15" width="100" /> <text type="string" @@ -99,8 +99,8 @@ left="5" visible="false" width="65" /> - <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="group_accordion"> - <accordion_tab min_height="515" title="Group General" name="group_general_tab"> + <accordion layout="topleft" left="2" width="296" top="135" height="500" follows="all" name="group_accordion"> + <accordion_tab min_height="445" title="Group General" name="group_general_tab"> <panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/> </accordion_tab> <accordion_tab min_height="380" title="Group Roles" name="group_roles_tab" expanded="False" can_resize="false"> |