3739639295
Conflicts: indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two. Compile fixies: indra/newview/llavataractions.cpp needed to include llnotifications.h indra/newview/llvoicechannel.cpp needed to include llnotifications.h
39 lines
1.8 KiB
XML
39 lines
1.8 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel name="toolbar">
|
|
<string name="Redock Windows">
|
|
Reacoplar Ventana
|
|
</string>
|
|
<layout_stack name="toolbar_stack" >
|
|
<layout_panel name="panel2">
|
|
<button label="" name="chat_btn" tool_tip="Mostrar Barra de Chat. (Intro)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel4">
|
|
<flyout_button label="Comunicación" name="communicate_btn" tool_tip="Comunícate con tus amigos o grupos.(Ctrl-T)" />
|
|
</layout_panel>
|
|
<layout_panel name="panel6">
|
|
<button label="Radar" name="radar_list_btn" tool_tip="Ver lista de avatares cercanos.(Ctrl-Shift-A)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel7">
|
|
<button label="Volar" label_selected="Stop Flying" name="fly_btn" tool_tip="Despegar(F o Inicio). Usa E/C o AvPáa/RePág para ascender o descender"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel8">
|
|
<button label="Foto" name="snapshot_btn" tool_tip="Guardar una captura de pantalla al disco o al inventario.(Ctrl-Shift-S para abrir el flotante, Ctrl-`(~) toma la captura sin el flotante)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel9">
|
|
<button label="Buscar" name="directory_btn" tool_tip="Buscar lugares, eventos, personas, y más.(Ctrl-F)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel10">
|
|
<button label="Construir" name="build_btn" tool_tip="Crear nuevos objetos. (B)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel11">
|
|
<button label="Mapa" name="map_btn" tool_tip="Mapa del Mundo. (Ctrl-M)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel12">
|
|
<button label="MiniMapa" name="radar_btn" tool_tip="Mapa del área a tu alrededor. (Ctrl-Shift-M)"/>
|
|
</layout_panel>
|
|
<layout_panel name="panel13">
|
|
<button label="Inventario" name="inventory_btn" tool_tip="Tus items. (Ctrl-I)"/>
|
|
</layout_panel>
|
|
</layout_stack>
|
|
</panel>
|