diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 13:05:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 13:05:26 -0400 |
| commit | b4ca93cadce90466d41704b68933c21fe909bcb8 (patch) | |
| tree | 34b19278571d885a42c5ae31baeb5af532e7ea39 /indra/newview/llpanelmarketplaceinboxinventory.cpp | |
| parent | cd382d08c84e2d984a4a20888280084daa290c3f (diff) | |
| parent | b1a7137ba6e56e1b692205f129d86acc942209e9 (diff) | |
merge up to 3.7.6-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; |