diff options
| author | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-14 21:48:58 +0200 |
|---|---|---|
| committer | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-14 21:48:58 +0200 |
| commit | e206dff762e9055391a8627c0067de0a11319f2f (patch) | |
| tree | 034876127c6dc54526babe9ce848b6813e29ef5a /indra/newview/llpanelobjectinventory.cpp | |
| parent | e44677ee79a38741d641fae74ba661b7e6b59794 (diff) | |
| parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 527aefe821..7555ac7b2c 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1569,6 +1569,8 @@ void LLPanelObjectInventory::reset() p.folder_indentation = -14; // subtract space normally reserved for folder expanders p.view_model = &mInventoryViewModel; p.root = NULL; + p.options_menu = "menu_inventory.xml"; + mFolders = LLUICtrlFactory::create<LLFolderView>(p); mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar); |