diff --git a/autobuild.xml b/autobuild.xml
index 9a68a704708255694a6ab1de2a5cbd18cdcb90d4..7d782a8021c84e0c4dec17c49dac1434aa048b91 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1098,7 +1098,7 @@
<key>llconvexdecomposition</key>
<map>
<key>license</key>
- <string>havok</string>
+ <string>llconvexdecomposition</string>
<key>license_file</key>
<string>on_file</string>
<key>name</key>
@@ -1759,6 +1759,78 @@
</map>
</map>
</map>
+ <key>havok</key>
+ <map>
+ <key>license</key>
+ <string>havok-ares</string>
+ <key>license_file</key>
+ <string>LICENSES/havok.txt</string>
+ <key>name</key>
+ <string>havok</string>
+ <key>platforms</key>
+ <map>
+ <key>darwin</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>286741271be3dc3473af3044ad6d002e</string>
+ <key>url</key>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Darwin/installer/havok-0.1-darwin-20110316.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>darwin</string>
+ </map>
+ <key>linux</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>1b6c85fc7705779cd2c2b02f7437fb24</string>
+ <key>url</key>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok/rev/224189/arch/Linux/installer/havok-0.1-linux-20110316.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>linux</string>
+ </map>
+ <key>windows</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>534c5217692bef44a60a3cf26ccb08d9</string>
+ <key>url</key>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-havok-source_Windows-vs2010/rev/245961/arch/CYGWIN/installer/havok_source-2011.2-windows-20111130.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>windows</string>
+ </map>
+ </map>
+ </map>
+ <key>llpathinglib</key>
+ <map>
+ <key>license</key>
+ <string>llpathinglib</string>
+ <key>license_file</key>
+ <string>LICENSES/llpathinglib.txt</string>
+ <key>name</key>
+ <string>llpathinglib</string>
+ <key>platforms</key>
+ <map>
+ <key>windows</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>hash</key>
+ <string>7cc6478529a05410375bf9f26876f275</string>
+ <key>url</key>
+ <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/246536/arch/CYGWIN/installer/llpathinglibrary-0.1-windows-20111209.tar.bz2</string>
+ </map>
+ <key>name</key>
+ <string>windows</string>
+ </map>
+ </map>
+ </map>
</map>
<key>package_description</key>
<map>
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..1b355792d0d168f9bd2422aebbd7fa405e1b9e80
--- /dev/null
+++ b/indra/cmake/Havok.cmake
@@ -0,0 +1,52 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(havok)
+set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include/havok/Source)
+if (CMAKE_BUILD_TYPE MATCHES "Debug")
+ set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/debug/havok)
+else (CMAKE_BUILD_TYPE MATCHES "Debug")
+ set(HAVOK_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/libraries/i686-win32/lib/release/havok)
+endif (CMAKE_BUILD_TYPE MATCHES "Debug")
+
+find_library(HK_BASE_LIB hkBase PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_COMPAT_LIB hkCompat PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_GEOMETRY_UTILITIES_LIB hkGeometryUtilities PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_INTERNAL_LIB hkInternal PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_SERIALIZE_LIB hkSerialize PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_SCENEDATA_LIB hkSceneData PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_COLLIDE_LIB hkpCollide PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_UTILITIES_LIB hkpUtilities PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_CONSTRAINTSOLVER_LIB hkpConstraintSolver PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_DYNAMICS_LIB hkpDynamics PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_INTERNAL_LIB hkpInternal PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_AI_INTERNAL_LIB hkaiInternal PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_AI_PATHFINDING_LIB hkaiPathfinding PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_AI_AIPHYSICSBRIDGE_LIB hkaiaiphysicsbridge PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_UTILITIES_LIB hkputilities PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_CD_INTERNAL_LIB hkcdinternal PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_PHYS_VEHICLE_LIB hkpVehicle PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_VISUALIZE_LIB hkVisualize PATHS ${HAVOK_LIBRARY_PATH})
+find_library(HK_AI_VISUALIZE_LIB hkaiVisualize PATHS ${HAVOK_LIBRARY_PATH})
+
+set(HK_LIBRARIES
+ ${HK_BASE_LIB}
+ ${HK_COMPAT_LIB}
+ ${HK_GEOMETRY_UTILITIES_LIB}
+ ${HK_INTERNAL_LIB}
+ ${HK_SERIALIZE_LIB}
+ ${HK_SCENEDATA_LIB}
+ ${HK_PHYS_COLLIDE_LIB}
+ ${HK_PHYS_UTILITIES_LIB}
+ ${HK_PHYS_CONSTRAINTSOLVER_LIB}
+ ${HK_PHYS_DYNAMICS_LIB}
+ ${HK_PHYS_INTERNAL_LIB}
+ ${HK_AI_INTERNAL_LIB}
+ ${HK_AI_PATHFINDING_LIB}
+ ${HK_AI_AIPHYSICSBRIDGE_LIB}
+ ${HK_PHYS_UTILITIES_LIB}
+ ${HK_CD_INTERNAL_LIB}
+ ${HK_PHYS_VEHICLE_LIB}
+ ${HK_VISUALIZE_LIB}
+ ${HK_AI_VISUALIZE_LIB}
+)
diff --git a/indra/cmake/LLPathingLib.cmake b/indra/cmake/LLPathingLib.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..b92190ad0a4732d4d828109017edbe98ea964efd
--- /dev/null
+++ b/indra/cmake/LLPathingLib.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+use_prebuilt_binary(llpathinglib)
+set(LLPATHING_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/libraries/include)
+if (CMAKE_BUILD_TYPE MATCHES "Debug")
+ set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
+else (CMAKE_BUILD_TYPE MATCHES "Debug")
+ set(LLPATHING_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
+endif (CMAKE_BUILD_TYPE MATCHES "Debug")
+
+find_library(LL_PATHING_LIB llpathinglib PATHS ${LLPATHING_LIBRARY_PATH})
+
+set(LLPATHING_LIBRARIES
+ ${LL_PATHING_LIB}
+)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c998ab351cdb24ebf9c9e27c9381339766f6bd9a..c1fe1729e5c5a59acc173ad3bba37ec9ff12bfb5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -13,6 +13,7 @@ include(EXPAT)
include(FMOD)
include(OPENAL)
include(FindOpenGL)
+include(Havok)
include(JsonCpp)
include(LLAudio)
include(LLCharacter)
@@ -23,6 +24,7 @@ include(LLImageJ2COJ)
include(LLInventory)
include(LLMath)
include(LLMessage)
+include(LLPathingLib)
include(LLPlugin)
include(LLPrimitive)
include(LLRender)
@@ -52,6 +54,7 @@ include_directories(
${LLCHARACTER_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${LLCONVEXDECOMP_INCLUDE_DIRS}
+ ${LLPATHING_INCLUDE_DIRS}
${FMOD_INCLUDE_DIR}
${LLIMAGE_INCLUDE_DIRS}
${LLKDU_INCLUDE_DIRS}
@@ -1739,6 +1742,8 @@ endif (WINDOWS)
# To work around this, higher level modules should be listed before the modules
# that they depend upon. -brad
target_link_libraries(${VIEWER_BINARY_NAME}
+ ${LLPATHING_LIBRARIES}
+ ${HK_LIBRARIES}
${UPDATER_LIBRARIES}
${GOOGLE_PERFTOOLS_LIBRARIES}
${LLAUDIO_LIBRARIES}