Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source 
Conflicts:
	indra/newview/llpreviewgesture.cpp
This commit is contained in:
Beeks
2010-09-12 17:26:21 -04:00
parent 3454f696ef 91c6ab94ac
commit 87ac06a9a0
7 changed files with 333 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/skins/default/xui/en-us/floater_contact_groups.xml
View File

@@ -35,27 +35,15 @@
width="112" />
<button bottom_delta="-3" follows="top|right" font="SansSerif" halign="center"
height="20" label="Create" label_selected="Create" left_delta="20" right="-10"
mouse_opaque="true" name="create_grp_btn" scale_image="TRUE" width="90" />
mouse_opaque="true" name="Create" scale_image="TRUE" width="90" />
<button bottom_delta="-25" follows="top|right" font="SansSerif" halign="center"
height="20" label="Delete" label_selected="Delete" right="-15"
mouse_opaque="true" name="Delete" scale_image="TRUE" width="90" />
<scroll_list background_visible="true" bottom_delta="-125" column_padding="5"
draw_border="true" draw_heading="false" draw_stripes="true"
follows="left|top|right" height="120" left="10" mouse_opaque="true"
multi_select="false" name="group_scroll_list" width="115" />
</panel>
<panel name="ManageGroupsPanel" label="Manage Groups"
border="true" bottom="0" height="150" left="0" width="135"
mouse_opaque="true">
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-24" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="InstructSelectCallingCard" v_pad="0"
width="220">
Select a calling card:
</text>
<inventory_panel allow_multi_select="false" border="true" bottom_delta="-117"
follows="left|top|right|bottom" height="110" left="10" mouse_opaque="true"
name="InventoryPanel" sort_order="AvatarPickerSortOrder" width="115" />
</panel>
</tab_container>
<button bottom="6" left="10" follows="left|bottom" font="SansSerif" halign="center"

2
indra/newview/skins/default/xui/en-us/panel_friends.xml
View File

@@ -13,7 +13,7 @@
bottom_delta="20" height="18" hidden="false" left="-235" max_chars="20" mouse_opaque="true"
tool_tip="Buddy group"
name="buddy_group_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="All"
<combo_item type="string" length="20" enabled="true" name="All"
value="All">
All
</combo_item>