diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 11:52:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-08-19 11:52:33 -0700 |
| commit | 38aa19614e1242e02c23a5dd2fbf5fae49783ed9 (patch) | |
| tree | 6f0a9a16874a1b0e28d42a781b7df6f1a18ee43e /indra | |
| parent | cf4355851606c996ed8269ac709c8eaa5c9ccdef (diff) | |
Mac build fix: changed "max" to "llmax"
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 5c13a46f56..0959a08359 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1703,7 +1703,7 @@ int get_folder_levels(LLInventoryCategory* inv_cat) for (S32 i=0; i < cats->count(); ++i) { LLInventoryCategory* category = cats->get(i); - max_child_levels = max(max_child_levels, get_folder_levels(category)); + max_child_levels = llmax(max_child_levels, get_folder_levels(category)); } return 1 + max_child_levels; |