diff options
author | Merov Linden <merov@lindenlab.com> | 2013-11-15 15:12:11 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-11-15 15:12:11 -0800 |
commit | 6ec99570cd86a89ed6367f81d6b0cccd7fe0e913 (patch) | |
tree | 5440488d03ad55cfd3bee06a08189790ab7b1888 /indra/newview/llpanelmarketplaceinboxinventory.cpp | |
parent | 148c3780e164d5bc94fa14b418e85fee72f9fd39 (diff) |
MAINT-3320 : Fixed! Inventory panels are not resistant to folder root deletion, using handle instead of pointer and cleaning things consistently
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; |