diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/integration_tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt index 67e8fbf1f2..664a3ee853 100644 --- a/indra/integration_tests/CMakeLists.txt +++ b/indra/integration_tests/CMakeLists.txt @@ -1,3 +1,3 @@ # -*- cmake -*- -add_subdirectory(llui_libtest) +#add_subdirectory(llui_libtest) diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index c9598a2576..704bc309ee 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -615,19 +615,21 @@ void LLLandmarksPanel::onClipboardAction(const LLSD& userdata) const void LLLandmarksPanel::onFoldingAction(const LLSD& userdata) { - if(!mCurrentSelectedList) return; - - LLFolderView* root_folder = mCurrentSelectedList->getRootFolder(); + LLFolderView* landmarks_folder = mLandmarksInventoryPanel->getRootFolder(); + LLFolderView* fav_folder = mFavoritesInventoryPanel->getRootFolder(); std::string command_name = userdata.asString(); if ("expand_all" == command_name) { - root_folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN); - root_folder->arrangeAll(); + landmarks_folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN); + fav_folder->setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN); + landmarks_folder->arrangeAll(); + fav_folder->arrangeAll(); } else if ("collapse_all" == command_name) { - root_folder->closeAllFolders(); + landmarks_folder->closeAllFolders(); + fav_folder->closeAllFolders(); } else if ( "sort_by_date" == command_name) { @@ -638,6 +640,9 @@ void LLLandmarksPanel::onFoldingAction(const LLSD& userdata) } else { + if(!mCurrentSelectedList) return; + + LLFolderView* root_folder = mCurrentSelectedList->getRootFolder(); root_folder->doToSelected(&gInventory, userdata); } } |