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
22 lines
688 B
XML
22 lines
688 B
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel name="notifications_panel">
|
|
<layout_stack name="stack1">
|
|
<layout_panel name="notifications_list_panel">
|
|
<scroll_list name="notifications_list">
|
|
<column label="Nombre" name="name"/>
|
|
<column label="Contenido" name="content"/>
|
|
<column label="Fecha" name="date"/>
|
|
</scroll_list>
|
|
</layout_panel>
|
|
<layout_panel name="rejects_list_panel">
|
|
<scroll_list name="notification_rejects_list">
|
|
<column label="Nombre" name="name"/>
|
|
<column label="Contenido" name="content"/>
|
|
<column label="Fecha" name="date"/>
|
|
</scroll_list>
|
|
</layout_panel>
|
|
</layout_stack>
|
|
|
|
<button name="header" label="" />
|
|
</panel>
|