aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventoryview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llinventoryview.cpp')
-rw-r--r--linden/indra/newview/llinventoryview.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 8ac5f21..112c071 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -502,11 +502,16 @@ void LLInventoryView::init(LLInventoryModel* inventory)
502 502
503 // Load the persistent "Recent Items" settings. 503 // Load the persistent "Recent Items" settings.
504 // Note that the "All Items" settings do not persist. 504 // Note that the "All Items" settings do not persist.
505 if(savedFilterState.has(recent_items_panel->getFilter()->getName())) 505 if(recent_items_panel)
506 { 506 {
507 LLSD recent_items = savedFilterState.get(recent_items_panel->getFilter()->getName()); 507 if(savedFilterState.has(recent_items_panel->getFilter()->getName()))
508 recent_items_panel->getFilter()->fromLLSD(recent_items); 508 {
509 LLSD recent_items = savedFilterState.get(
510 recent_items_panel->getFilter()->getName());
511 recent_items_panel->getFilter()->fromLLSD(recent_items);
512 }
509 } 513 }
514
510 } 515 }
511 516
512 517
@@ -516,7 +521,6 @@ void LLInventoryView::init(LLInventoryModel* inventory)
516 mSearchEditor->setSearchCallback(onSearchEdit, this); 521 mSearchEditor->setSearchCallback(onSearchEdit, this);
517 } 522 }
518 523
519 moveResizeHandleToFront();
520 sActiveViews.put(this); 524 sActiveViews.put(this);
521 525
522 gInventory.addObserver(this); 526 gInventory.addObserver(this);