Yoinkin' it right...

indra/newview/llfloatermodelpreview.cpp

@@ -328,7 +328,7 @@ bool LLFloaterModelPreview::postBuild()
     // </Ansariel>
 
 // <FS:CR> Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok
-#ifndef HAVOK_TPV
+#if !LL_HAVOK
     LLSD args;
     args["FEATURE"] = getString("no_havok");
     LLNotificationsUtil::add("NoHavok", args);

indra/newview/llfloaterpathfindingconsole.cpp

@@ -52,12 +52,6 @@
 #include "llviewerparcelmgr.h"
 #include "pipeline.h"
 
-// <FS:CR> For NoHavok alert
-#ifndef HAVOK_TPV
-#include "llnotificationsutil.h"
-#endif // OPENSIM
-// </FS:CR>
-
 #define XUI_RENDER_HEATMAP_NONE 0
 #define XUI_RENDER_HEATMAP_A 1
 #define XUI_RENDER_HEATMAP_B 2
@@ -245,13 +239,6 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
     {
         switchIntoTestPathMode();
     }
-// <FS:CR> Show an alert dialog if using the Opensim viewer as functionality will be limited without Havok
-#ifndef HAVOK_TPV
-    LLSD args;
-    args["FEATURE"] = getString("no_havok");
-    LLNotificationsUtil::add("NoHavok", args);
-#endif // OPENSIM
-// </FS:CR>
 }
 
 void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)

indra/newview/llmodelpreview.cpp

@@ -3387,7 +3387,7 @@ void LLModelPreview::updateStatusMessages()
     //        physStatusIcon->setImage(img);
     //    }
     //}
-#ifndef HAVOK_TPV
+#if !LL_HAVOK
     has_physics_error |= PhysicsError::NOHAVOK;
 #endif
 

indra/newview/llpathfindingpathtool.cpp

@@ -230,11 +230,7 @@ LLPathfindingPathTool::EPathStatus LLPathfindingPathTool::getPathStatus() const
 
 F32 LLPathfindingPathTool::getCharacterWidth() const
 {
-#ifdef HAVOK_TPV
     return mFinalPathData.mCharacterWidth;
-#else
-    return (F32)mFinalPathData.mCharacterWidth;
-#endif
 }
 
 void LLPathfindingPathTool::setCharacterWidth(F32 pCharacterWidth)