summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-02-11 16:08:45 -0800
committerMerov Linden <merov@lindenlab.com>2013-02-11 16:08:45 -0800
commit279d4a95ea84ddeb32efc54deb6923202fe638a7 (patch)
tree251fd6473f415e2558e69d27cfd767200e29eb7e /indra/newview
parent5ecac2e900054526c5e9e2fe5610f470ad06df32 (diff)
CHUI-690 : Fixed! Prevent xml parsing error when building Places panel providing an option menu to the LLFolderView constructor
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llplacesinventorypanel.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index 01586a4d91..4c2213c198 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -82,6 +82,7 @@ LLFolderView * LLPlacesInventoryPanel::createFolderRoot(LLUUID root_id )
p.show_item_link_overlays = mShowItemLinkOverlays;
p.root = NULL;
p.use_ellipses = mParams.folder_view.use_ellipses;
+ p.options_menu = "menu_inventory.xml";
return LLUICtrlFactory::create<LLPlacesFolderView>(p);
}