diff options
author | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
commit | aae241c43f66c3ef59cb076d00e42f9a857de354 (patch) | |
tree | 82da2afc116915897a3207cc8eed120aef5ef3fd /indra/newview/llinventoryfunctions.cpp | |
parent | 17bb7f4fc5463e9426179b0ded810b51ef291c79 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
merge changes for 5.1.2-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); |