diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-04-22 18:52:03 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-04-22 18:52:03 -0700 |
| commit | 74f0d33dc1f81fe3d372da4b11799067349b64e7 (patch) | |
| tree | 614228044e64a9c4c93c0de2778585035fc2a5d3 /indra | |
| parent | a505c3734a4a3f644500558030b4496d3cb5a5b5 (diff) | |
ACME-252: Created a folder view for the facebook connect tab
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpersonfolderview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/person_folder_view.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpersonfolderview.cpp b/indra/newview/llpersonfolderview.cpp index e1f1cbb1fa..97b2ce092b 100644 --- a/indra/newview/llpersonfolderview.cpp +++ b/indra/newview/llpersonfolderview.cpp @@ -43,7 +43,7 @@ LLFolderViewFolder(p) } S32 LLPersonFolderView::getLabelXPos() -{ +{ return getIndentation() + mArrowSize + 15;//Should be a .xml variable but causes crash; } @@ -55,7 +55,7 @@ LLPersonFolderView::~LLPersonFolderView() void LLPersonFolderView::draw() { static LLUIColor sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE); - static const LLFolderViewItem::Params& default_params = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>(); + static const LLFolderViewItem::Params& default_params = LLUICtrlFactory::getDefaultParams<LLPersonFolderView>(); static LLUIColor sHighlightBgColor = LLUIColorTable::instance().getColor("MenuItemHighlightBgColor", DEFAULT_WHITE); static LLUIColor sFlashBgColor = LLUIColorTable::instance().getColor("MenuItemFlashBgColor", DEFAULT_WHITE); diff --git a/indra/newview/skins/default/xui/en/widgets/person_folder_view.xml b/indra/newview/skins/default/xui/en/widgets/person_folder_view.xml index bf22230ff9..46857ac700 100644 --- a/indra/newview/skins/default/xui/en/widgets/person_folder_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/person_folder_view.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <conversation_view_session folder_arrow_image="Folder_Arrow" - folder_indentation="4" + folder_indentation="5" item_height="20" - item_top_pad="0" + item_top_pad="3" mouse_opaque="true" follows="left|top|right" text_pad="4" text_pad_left="4" text_pad_right="4" - arrow_size="11" + arrow_size="10" max_folder_item_overlap="2"/> |