diff options
| author | Jacek Antonelli | 2008-09-22 14:54:55 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-22 14:54:55 -0500 |
| commit | aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7 (patch) | |
| tree | db867cf6defce8d965b244c1445bb2e983c317b1 /linden/indra/newview/skins | |
| parent | Merge branch 'land-tools' into next-merge (diff) | |
| parent | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button. (diff) | |
| download | meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.zip meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.gz meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.bz2 meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.xz | |
Merge branch 'VWR-2072' into next-merge
Diffstat (limited to 'linden/indra/newview/skins')
| -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 cb27be6..3a660ab 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 | |||
| @@ -48,6 +48,9 @@ | |||
| 48 | image_unselected="icn_speaker_dark.tga" label="" left_delta="56" | 48 | image_unselected="icn_speaker_dark.tga" label="" left_delta="56" |
| 49 | name="mute_btn" tool_tip="Mute voice" width="25" /> | 49 | name="mute_btn" tool_tip="Mute voice" width="25" /> |
| 50 | </panel> | 50 | </panel> |
| 51 | <button bottom_delta="0" follows="right|top" font="SansSerif" | ||
| 52 | halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5" | ||
| 53 | mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" /> | ||
| 51 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" | 54 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" |
| 52 | bottom="30" embedded_items="false" enabled="false" | 55 | bottom="30" embedded_items="false" enabled="false" |
| 53 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" | 56 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" |