diff options
author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/newview/llinventoryfunctions.cpp | |
parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 8b50e4248e..e056ccebee 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1178,7 +1178,7 @@ bool can_move_folder_to_marketplace(const LLInventoryCategory* root_folder, LLIn int incoming_folder_depth = get_folder_levels(inv_cat); // Compute the nested folders level we're inserting ourselves in // Note: add 1 when inserting under a listing folder as we need to take the root listing folder in the count - int insertion_point_folder_depth = (root_folder ? get_folder_path_length(root_folder->getUUID(), dest_folder->getUUID()) + 1 : 0); + int insertion_point_folder_depth = (root_folder ? get_folder_path_length(root_folder->getUUID(), dest_folder->getUUID()) + 1 : 1); // Get the version folder: that's where the folders and items counts start from const LLViewerInventoryCategory * version_folder = (insertion_point_folder_depth >= 2 ? gInventory.getFirstDescendantOf(root_folder->getUUID(), dest_folder->getUUID()) : NULL); |