diff options
author | David Seikel | 2011-04-21 06:18:43 +1000 |
---|---|---|
committer | David Seikel | 2011-04-21 06:18:43 +1000 |
commit | 147b2694843c541e324a9db35759ca237487c932 (patch) | |
tree | 977cc76a5fd6942d8c5487793ebd725abdb137a2 /linden/indra/newview/skins/default | |
parent | Allow changing the text on a flyout button. (diff) | |
download | meta-impy-147b2694843c541e324a9db35759ca237487c932.zip meta-impy-147b2694843c541e324a9db35759ca237487c932.tar.gz meta-impy-147b2694843c541e324a9db35759ca237487c932.tar.bz2 meta-impy-147b2694843c541e324a9db35759ca237487c932.tar.xz |
Half finished UI clean up for OTR, but it works.
Hence all the commented out stuff that will be sorted out soon.
I have a different idea about how that will work.
Diffstat (limited to 'linden/indra/newview/skins/default')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml index 5ad564a..22875d7 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml | |||
@@ -95,6 +95,26 @@ | |||
95 | image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" | 95 | image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" |
96 | label="End Call" left_delta="0" name="end_call_btn" pad_right="10" | 96 | label="End Call" left_delta="0" name="end_call_btn" pad_right="10" |
97 | visible="false" width="100" /> | 97 | visible="false" width="100" /> |
98 | |||
99 | <flyout_button bottom_delta="0" follows="left|top" height="20" label="OTR: Status" left_delta="5" width="150" | ||
100 | list_position="below" mouse_opaque="true" name="otr_btn"> | ||
101 | <flyout_button_item value="otr_start_entry" name="otr_start_entry"> | ||
102 | Start private conversation | ||
103 | </flyout_button_item> | ||
104 | <flyout_button_item value="otr_stop_entry" name="otr_stop_entry"> | ||
105 | End private conversation | ||
106 | </flyout_button_item> | ||
107 | <flyout_button_item value="otr_auth_entry" name="otr_auth_entry"> | ||
108 | Authenticate buddy | ||
109 | </flyout_button_item> | ||
110 | <flyout_button_item value="otr_help_entry" name="otr_help_entry"> | ||
111 | What is OTR? | ||
112 | </flyout_button_item> | ||
113 | <flyout_button_item value="otr_levels_entry" name="otr_levels_entry"> | ||
114 | What is this? | ||
115 | </flyout_button_item> | ||
116 | </flyout_button> | ||
117 | |||
98 | <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" | 118 | <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" |
99 | text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true" | 119 | text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true" |
100 | bg_visible="false" border_drop_shadow_visible="false" border_visible="false"> | 120 | bg_visible="false" border_drop_shadow_visible="false" border_visible="false"> |