From c890d32101f559ef4422b3af3a9aa4c14b429743 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 20 Jun 2014 22:06:31 -0700 Subject: DD-150 : Fix U32 to S32 conversion that failed a condition in folder count --- indra/newview/llinventoryfunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 08c6d7e577..88967a4d39 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1107,7 +1107,7 @@ bool can_move_folder_to_marketplace(const LLInventoryCategory* root_folder, LLIn // Compare the whole with the nested folders depth limit // Note: substract 2 as we leave root and version folder out of the count threshold - if ((incoming_folder_depth + insertion_point_folder_depth - 2) > gSavedSettings.getU32("InventoryOutboxMaxFolderDepth")) + if ((incoming_folder_depth + insertion_point_folder_depth - 2) > (S32)(gSavedSettings.getU32("InventoryOutboxMaxFolderDepth"))) { LLStringUtil::format_map_t args; U32 amount = gSavedSettings.getU32("InventoryOutboxMaxFolderDepth"); -- cgit v1.2.3