diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-18 16:54:34 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-18 16:54:34 +0000 |
| commit | 0710d0da2ba0d4c0fe66b890f1598d8df7ea4917 (patch) | |
| tree | cb9323d21b0316a5c2cdfa9143b7f4355c6188f1 /indra/newview/skins/default/xui/en/panel_profile.xml | |
| parent | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1378 https://svn.aws.productengine.com/secondlife/pe/stable-1@1386 -> viewer-2.0.0-3
EXT-357 EXT-370 EXT-385 EXT-409 EXT-472 EXT-479 EXT-513 EXT-532 EXT-541 EXT-544 EXT-546
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_profile.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile.xml | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index d00ff7a6a1..65db3cc7a1 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -72,7 +72,7 @@ top="0" left="0" width="240" - height="500"> + height="520"> <panel follows="left|top" @@ -251,6 +251,41 @@ width="40" /> </panel> <text + type="string" + follows="left|top" + font="SansSerifBold" + height="15" + halign="right" + layout="topleft" + left="10" + name="online_me_status_text" + text_color="white" + top_pad="20" + width="100"> + Status: + </text> + <combo_box + font="SansSerifBold" + height="18" + layout="topleft" + left_pad="0" + top_delta="0" + name="status_combo" + width="100"> + <combo_box.item + label="Online" + name="online" + value="online" /> + <combo_box.item + label="Away" + name="away" + value="away" /> + <combo_box.item + label="Busy" + name="busy" + value="busy" /> + </combo_box> + <text follows="left|top" font="SansSerifBold" halign="right" |