diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-04-22 13:32:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-04-22 13:32:15 -0700 |
| commit | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (patch) | |
| tree | 81945284f515f25ce23284077b1e07f500ad64ff /indra/newview/llpanelmarketplaceinboxinventory.cpp | |
| parent | c79abac5ad5d41f86655883fd9f3ec6a108967a7 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpanelmarketplaceinboxinventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelmarketplaceinboxinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp index adfb2dee86..da938712d7 100755 --- a/indra/newview/llpanelmarketplaceinboxinventory.cpp +++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp @@ -69,7 +69,7 @@ LLFolderViewFolder * LLInboxInventoryPanel::createFolderViewFolder(LLInvFVBridge LLInboxFolderViewFolder::Params params; params.name = bridge->getDisplayName(); - params.root = mFolderRoot; + params.root = mFolderRoot.get(); params.listener = bridge; params.tool_tip = params.name; params.font_color = item_color; @@ -86,7 +86,7 @@ LLFolderViewItem * LLInboxInventoryPanel::createFolderViewItem(LLInvFVBridge * b params.name = bridge->getDisplayName(); params.creation_date = bridge->getCreationDate(); - params.root = mFolderRoot; + params.root = mFolderRoot.get(); params.listener = bridge; params.rect = LLRect (0, 0, 0, 0); params.tool_tip = params.name; |