diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-16 15:58:05 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-16 15:58:05 -0700 |
| commit | 86c572ad63f0cf222050e807899e80ea5802e1d7 (patch) | |
| tree | 2df6b20aaa8f932139332ab97ce303bddd6b03be /indra | |
| parent | 356c29c888e6220915a0f050c393c7e91d922318 (diff) | |
EXP-1915 : Fetch recursively folders when selected
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 9b8c311d16..8d3ac3e723 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1775,9 +1775,6 @@ BOOL LLFolderBridge::isItemMovable() const // If it's a protected type folder, we can't move it if (LLFolderType::lookupIsProtectedType(((LLInventoryCategory*)obj)->getPreferredType())) return FALSE; - // If the folder is not there yet, it's too early to decide if it's movable - if (!isUpToDate()) - return FALSE; return TRUE; } return FALSE; @@ -1785,9 +1782,10 @@ BOOL LLFolderBridge::isItemMovable() const void LLFolderBridge::selectItem() { + // Have no fear: the first thing start() does is to test if everything for that folder has been fetched... + LLInventoryModelBackgroundFetch::instance().start(getUUID(), true); } - // Iterate through a folder's children to determine if // all the children are removable. class LLIsItemRemovable : public LLFolderViewFunctor @@ -1813,10 +1811,6 @@ BOOL LLFolderBridge::isItemRemovable() const return FALSE; } - // If the folder is not there yet, we shouldn't try to remove it yet - if (!isUpToDate()) - return FALSE; - LLInventoryPanel* panel = mInventoryPanel.get(); LLFolderViewFolder* folderp = dynamic_cast<LLFolderViewFolder*>(panel ? panel->getRootFolder()->getItemByID(mUUID) : NULL); if (folderp) @@ -1849,10 +1843,6 @@ BOOL LLFolderBridge::isItemCopyable() const { // Folders are copyable if items in them are, recursively, copyable. - // If the folder is not there yet, it's not copyable - if (!isUpToDate()) - return FALSE; - // Get the content of the folder LLInventoryModel::cat_array_t* cat_array; LLInventoryModel::item_array_t* item_array; |