diff options
| author | elektrahesse | 2010-09-07 18:39:40 +0200 |
|---|---|---|
| committer | elektrahesse | 2010-09-07 18:39:40 +0200 |
| commit | 22383f92482798cf5b5439396bdcdf1c8f9aa073 (patch) | |
| tree | 538bc3c53d1d1f4245cf738d6ac045fa57dbe8d4 /linden/indra/newview/llinventoryview.cpp | |
| parent | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly (diff) | |
| parent | Use solid circles instead of asterisks for password fields. (diff) | |
| download | meta-impy-22383f92482798cf5b5439396bdcdf1c8f9aa073.zip meta-impy-22383f92482798cf5b5439396bdcdf1c8f9aa073.tar.gz meta-impy-22383f92482798cf5b5439396bdcdf1c8f9aa073.tar.bz2 meta-impy-22383f92482798cf5b5439396bdcdf1c8f9aa073.tar.xz | |
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llinventoryview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index 952121f..939d50b 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
| @@ -578,11 +578,11 @@ void LLInventoryView::init(LLInventoryModel* inventory) | |||
| 578 | std::ostringstream filterSaveName; | 578 | std::ostringstream filterSaveName; |
| 579 | filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml"); | 579 | filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml"); |
| 580 | llinfos << "LLInventoryView::init: reading from " << filterSaveName << llendl; | 580 | llinfos << "LLInventoryView::init: reading from " << filterSaveName << llendl; |
| 581 | llifstream file(filterSaveName.str()); | 581 | llifstream file(filterSaveName.str()); |
| 582 | LLSD savedFilterState; | 582 | LLSD savedFilterState; |
| 583 | if (file.is_open()) | 583 | if (file.is_open()) |
| 584 | { | 584 | { |
| 585 | LLSDSerialize::fromXML(savedFilterState, file); | 585 | LLSDSerialize::fromXML(savedFilterState, file); |
| 586 | file.close(); | 586 | file.close(); |
| 587 | 587 | ||
| 588 | // Load the persistent "Recent Items" settings. | 588 | // Load the persistent "Recent Items" settings. |