summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmarketplaceinboxinventory.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-21 13:04:07 -0700
committersimon <none@none>2014-04-21 13:04:07 -0700
commitfdb28bccb92d121f1b3dfc068a50d5cc3db43ce9 (patch)
tree391f32cc407d6e9c14bd4804b7ece4f53df3250c /indra/newview/llpanelmarketplaceinboxinventory.cpp
parent80eafe2ff3b235b6355ae2f20e8301374623e6ea (diff)
parenta5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff)
Merge downstream code
Diffstat (limited to 'indra/newview/llpanelmarketplaceinboxinventory.cpp')
-rwxr-xr-xindra/newview/llpanelmarketplaceinboxinventory.cpp4
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;