livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-649 : Fixed : Added the contextual menu to in build content tab

meow-7.2.2
Merov Linden 2013-01-10 11:10:41 -08:00
parent be3cfd872b
commit b5b44ddf17
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorypanel.cpp
View File

@ -181,7 +181,7 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
LLAssetType::AT_CATEGORY,
LLInventoryType::IT_CATEGORY,
this,
&mInventoryViewModel,
&mInventoryViewModel,
NULL,
root_id);
p.view_model = &mInventoryViewModel;
@ -218,7 +218,7 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
mFolderRoot = createFolderRoot(root_id);
addItemID(root_id, mFolderRoot);
}
}
mCommitCallbackRegistrar.popScope();
mFolderRoot->setCallbackRegistrar(&mCommitCallbackRegistrar);

2
indra/newview/llpanelobjectinventory.cpp
View File

@ -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);