diff options
| author | Jacek Antonelli | 2008-10-03 02:21:33 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-03 15:27:46 -0500 |
| commit | f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6 (patch) | |
| tree | 3e6c0dd5415915a14b5cd00747f4615d9f506570 /linden/indra/newview/skins/default/xui | |
| parent | Added .gitignore to ignore artwork, libs, and compiled stuff. (diff) | |
| parent | 'Offer Teleport' button in friends list is now enabled (diff) | |
| download | meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.zip meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.gz meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.bz2 meta-impy-f1b1e0dcb9f620f21c47e132d97fea6c0bf5eed6.tar.xz | |
Merge branch 'offer-teleport' into next
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml | 3 |
1 files changed, 3 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 cce06b5..c3058c4 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 | |||
| @@ -51,6 +51,9 @@ | |||
| 51 | image_unselected="icn_speaker_dark.tga" label="" left_delta="56" | 51 | image_unselected="icn_speaker_dark.tga" label="" left_delta="56" |
| 52 | name="mute_btn" tool_tip="Mute voice" width="25" /> | 52 | name="mute_btn" tool_tip="Mute voice" width="25" /> |
| 53 | </panel> | 53 | </panel> |
| 54 | <button bottom_delta="0" follows="right|top" font="SansSerif" | ||
| 55 | halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5" | ||
| 56 | mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" /> | ||
| 54 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" | 57 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" |
| 55 | bottom="30" embedded_items="false" enabled="false" | 58 | bottom="30" embedded_items="false" enabled="false" |
| 56 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" | 59 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" |