From 96add52a1c414bae4da030c3ab8604f15bd9c8db Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 3 Apr 2008 23:53:20 +0000
Subject: [PATCH] Fix mac build from havok4 merge.

---
 indra/llprimitive/llmaterialtable.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
index 3eea03e0b9a..6d30917bd95 100644
--- a/indra/llprimitive/llmaterialtable.cpp
+++ b/indra/llprimitive/llmaterialtable.cpp
@@ -36,7 +36,6 @@
 #include "material_codes.h"
 #include "sound_ids.h"
 #include "imageids.h"
-#include <llphysics/llphysicsversion.h>
 
 LLMaterialTable LLMaterialTable::basic(1);
 
@@ -60,7 +59,7 @@ F32 const LLMaterialTable::FRICTION_RUBBER 	= 0.9f; 	//
 F32 const LLMaterialTable::FRICTION_MAX 	= 0.95f; 	//
 */
 
-#if LL_CURRENT_HAVOK_VERSION == LL_HAVOK_VERSION_460
+// #if LL_CURRENT_HAVOK_VERSION == LL_HAVOK_VERSION_460
 // Havok4 has more correct friction dynamics, however here we have to use
 // the "incorrect" equivalents for the legacy Havok1 behavior
 F32 const LLMaterialTable::FRICTION_MIN 	= 0.15f; 	
@@ -74,7 +73,7 @@ F32 const LLMaterialTable::FRICTION_LAND 	= 0.58f; 	// dirt
 F32 const LLMaterialTable::FRICTION_STONE 	= 0.6f; 	// concrete
 F32 const LLMaterialTable::FRICTION_RUBBER 	= 0.67f; 	//
 F32 const LLMaterialTable::FRICTION_MAX 	= 0.71f; 	//
-#endif
+// #endif
 
 F32 const LLMaterialTable::RESTITUTION_MIN 		= 0.02f; 	
 F32 const LLMaterialTable::RESTITUTION_LAND 	= LLMaterialTable::RESTITUTION_MIN;
-- 
GitLab