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/llinventorypanel.cpp | |
| parent | e44677ee79a38741d641fae74ba661b7e6b59794 (diff) | |
| parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 25dc365467..c4918f0a31 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -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); |