From 822dc1c580bc538b233132935639ee7574fe7186 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 21 Aug 2012 09:30:55 -0400
Subject: storm-1906: correct cmake error when using precompiled
 llphysicsextensions_tpv

---
 indra/newview/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 753dbd7438..3cd03f8641 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -45,7 +45,10 @@ include(VisualLeakDetector)
 include(GLOD)
 include(CMakeCopyIfDifferent)
 
-add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions)
+if (NOT HAVOK_TPV)
+   # When using HAVOK_TPV, the library is precompiled, so no need for this
+   add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions)
+endif (NOT HAVOK_TPV)
 
 include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
-- 
cgit v1.2.3


From 0e4fa75e6441cdb6dac8b9463ce9c3ff3a0a6596 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 22 Aug 2012 11:12:53 -0400
Subject: tag merge of DRTVWR-201

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f21607d9f5..4031f9bd19 100644
--- a/.hgtags
+++ b/.hgtags
@@ -360,3 +360,4 @@ e9732c739c8a72a590216951505ea9c76a526a84 DRTVWR-193
 b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2
 37402e2b19af970d51b0a814d79892cc5647532b DRTVWR-200
 182a9bf30e81070361bb020a78003b1cf398e79c 3.4.0-beta3
+7649a3dff5ec22d3727377e5f02efd0f421e4cb5 DRTVWR-201
-- 
cgit v1.2.3