From 38aa19614e1242e02c23a5dd2fbf5fae49783ed9 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 19 Aug 2011 11:52:33 -0700
Subject: [PATCH] Mac build fix: changed "max" to "llmax"
---
indra/newview/llinventorybridge.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5c13a46f56c..0959a083590 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;
--
GitLab