diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-20 22:06:31 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-20 22:06:31 -0700 |
| commit | c890d32101f559ef4422b3af3a9aa4c14b429743 (patch) | |
| tree | cc9921a17ba95dceac79ec766ad6febf69365f6c /indra/newview | |
| parent | 75cd973df01491bc61bda3e91aa55aec96046343 (diff) | |
DD-150 : Fix U32 to S32 conversion that failed a condition in folder count
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | 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 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"); |