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
21 lines
1.5 KiB
XML
21 lines
1.5 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel name="notifications_panel" width="100" height="100" user_resize="true" >
|
|
<layout_stack name="stack1" left="0" bottom="2" width="100" height="78" follows="left|right|top|bottom" orientation="horizontal" >
|
|
<layout_panel name="notifications_list_panel" width="100" user_resize="true">
|
|
<scroll_list draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notifications_list" sort_column="2" sort_ascending="false">
|
|
<column label="Name" name="name" width="100" user_resize="true"/>
|
|
<column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
|
|
<column label="Date" name="date" width="150" user_resize="true"/>
|
|
</scroll_list>
|
|
</layout_panel>
|
|
<layout_panel name="rejects_list_panel" width="100" user_resize="true">
|
|
<scroll_list draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notification_rejects_list" sort_column="2" sort_ascending="false">
|
|
<column label="Name" name="name" width="100" user_resize="true"/>
|
|
<column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
|
|
<column label="Date" name="date" width="150" user_resize="true"/>
|
|
</scroll_list>
|
|
</layout_panel>
|
|
</layout_stack>
|
|
<button name="header" label="" image="rounded_square.tga" left="0" bottom="-20" width="100" height="20" follows="left|right|top" toggle="true"/>
|
|
</panel>
|