diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
| commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
| tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/skins/default/xui/en/panel_pick_info.xml | |
| parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
| parent | e3344abb95802646912f357d214538966f3f2357 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_pick_info.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_pick_info.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 7489988722..375f369ba7 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -61,8 +61,11 @@ name="pick_snapshot" top="20" width="280" /> - <text + <text_editor + allow_scroll="false" + bg_visible="false" follows="left|top|right" + h_pad="0" height="35" width="280" layout="topleft" @@ -71,17 +74,24 @@ left="10" top_pad="10" name="pick_name" + read_only="true" text_color="white" + v_pad="0" value="[name]" use_ellipses="true" /> - <text + <text_editor + allow_scroll="false" + bg_visible="false" follows="left|top|right" + h_pad="0" height="25" layout="topleft" left="10" name="pick_location" + read_only="true" width="280" word_wrap="true" + v_pad="0" value="[loading...]" /> <text_editor bg_readonly_color="DkGray2" |