summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-02-12 01:36:35 +0000
committerCho <cho@lindenlab.com>2013-02-12 01:36:35 +0000
commita5913144598e453b55a5e447a6ad2f34fb750722 (patch)
treeba5f1e9dd00c2a824b09ac9b8f4e7f344775cfd8 /indra/newview
parent5a92a7700666f40883b72deed8429e7e06164623 (diff)
parent2317591c93b5870acd6fdedbecc2d8050511459d (diff)
merging
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);
}