diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-07-17 12:07:25 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-07-17 12:07:25 -0700 |
| commit | ec4d1a2450807afcff5c0f0ebf651c9e67f1b310 (patch) | |
| tree | 061c411bb1e61b10cd05e6e59aeefbf04d11a2a2 /indra/newview | |
| parent | 8fd35a0a084303073bc40580d69c797c073fb4dc (diff) | |
CHUI-234 : Fix crashers in landmarks panel
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llplacesinventorypanel.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index faef923338..4bbab52e5a 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -651,7 +651,7 @@ void LLLandmarksPanel::onAccordionExpandedCollapsed(const LLSD& param, LLPlacesI // Start background fetch, mostly for My Inventory and Library if (expanded) { - const LLUUID &cat_id = mCurrentSelectedList->getRootFolderID(); + const LLUUID &cat_id = inventory_list->getRootFolderID(); // Just because the category itself has been fetched, doesn't mean its child folders have. /* if (!gInventory.isCategoryComplete(cat_id)) diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp index d95d5eac19..65d9691902 100644 --- a/indra/newview/llplacesinventorypanel.cpp +++ b/indra/newview/llplacesinventorypanel.cpp @@ -93,6 +93,7 @@ void LLPlacesInventoryPanel::buildFolderView(const LLInventoryPanel::Params& par p.parent_panel = this; p.allow_multiselect = mAllowMultiSelect; p.use_ellipses = true; // truncate inventory item text so remove horizontal scroller + p.view_model = &mInventoryViewModel; mFolderRoot = LLUICtrlFactory::create<LLPlacesFolderView>(p); } |