aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-05 11:23:13 -0700
committerJacek Antonelli2010-06-19 02:43:31 -0500
commitf96a6b0675c218b3671085e5c228eb52a1718906 (patch)
tree3e4b271c15c7bfce830fc2a5cb9b99aa315a233c /linden/indra/newview/skins/default/xui
parentUpdated llcharacter with some bits from Emerald and SnowGlobe (diff)
downloadmeta-impy-f96a6b0675c218b3671085e5c228eb52a1718906.zip
meta-impy-f96a6b0675c218b3671085e5c228eb52a1718906.tar.gz
meta-impy-f96a6b0675c218b3671085e5c228eb52a1718906.tar.bz2
meta-impy-f96a6b0675c218b3671085e5c228eb52a1718906.tar.xz
Ported group titles window from the Cool Viewer and placed it in the groups list
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_group_titles.xml17
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_groups.xml2
2 files changed, 19 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_group_titles.xml b/linden/indra/newview/skins/default/xui/en-us/floater_group_titles.xml
new file mode 100644
index 0000000..5ec037f
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_group_titles.xml
@@ -0,0 +1,17 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="goup titles" title="Group Titles" rect_control="FloaterGroupTitlesRect"
3 can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
4 min_width="300" min_height="150" width="400" height="500">
5 <scroll_list name="titles_list" can_resize="true" multi_select="false"
6 background_visible="true" draw_border="true" draw_stripes="true" draw_heading="true"
7 height="450" width="380" bottom_delta="-470" top="10" left="10" follows="left|top|right|bottom">
8 <column name="title" label="Title" dynamicwidth="true" />
9 <column name="group_name" label="Group" dynamicwidth="true" />
10 <!--Hidden field, used as storage for UUID, please keep at width 0-->
11 <column name="group_id" label="" width="0" />
12 </scroll_list>
13 <button name="activate" label="Activate" tool_tip="Activate the selected group title"
14 enabled="true" mouse_opaque="true" font="SansSerif" halign="center"
15 height="20" width="90" bottom_delta="-24" left="10" follows="left|bottom"
16 />
17</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 0bc7866..e6b78fb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -26,6 +26,8 @@
26 tool_tip="Open Instant Message session" width="80" /> 26 tool_tip="Open Instant Message session" width="80" />
27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 27 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
28 label="Activate" name="Activate" width="80" /> 28 label="Activate" name="Activate" width="80" />
29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
30 label="Titles..." name="Titles..." width="80" />
29 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
30 label="Invite..." name="Invite..." width="80" /> 32 label="Invite..." name="Invite..." width="80" />
31 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" 33 <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"