diff --git a/indra/cmake/ColladaDom.cmake b/indra/cmake/ColladaDom.cmake
new file mode 100644
index 0000000000..d3c3a27e3f
--- /dev/null
+++ b/indra/cmake/ColladaDom.cmake
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+include (Prebuilt)
+
+if (STANDALONE)
+  find_path(COLLADA_INCLUDE_DIRS 1.4/dom/domConstants.h
+    PATH_SUFFIXES collada)
+  set(COLLADA_INCLUDE_DIRS
+    ${COLLADA_INCLUDE_DIRS} ${COLLADA_INCLUDE_DIRS}/1.4
+    )
+else (STANDALONE)
+  set(COLLADA_INCLUDE_DIRS
+    ${LIBS_PREBUILT_DIR}/include/collada
+    ${LIBS_PREBUILT_DIR}/include/collada/1.4
+    )
+endif (STANDALONE)
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index e4d9de7eb6..cea92b2e09 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -8,6 +8,7 @@ include(LLMath)
 include(LLMessage)
 include(LLXML)
 include(LLPhysicsExtensions)
+include(ColladaDom)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -15,8 +16,9 @@ include_directories(
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS}
-    ${LIBS_PREBUILT_DIR}/include/collada
-    ${LIBS_PREBUILT_DIR}/include/collada/1.4
+    # ${LIBS_PREBUILT_DIR}/include/collada
+    # ${LIBS_PREBUILT_DIR}/include/collada/1.4
+    ${COLLADA_INCLUDE_DIRS}
     )
 
 set(llprimitive_SOURCE_FILES
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 004168192d..1810f0930e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -46,6 +46,7 @@ include(VisualLeakDetector)
 include(GLOD)
 include(CMakeCopyIfDifferent)
 include(Growl)
+include(ColladaDom)
 
 # <FS:ND> if using ndPhysicsstub this variable will be unset, we don't need to build any stub code viewer side in that case
 if( LLPHYSICSEXTENSIONS_SRC_DIR )
@@ -93,6 +94,7 @@ include_directories(
     ${GROWL_INCLUDE_DIRS}
     ${TEAPOT_INCLUDE_DIRS}# <FS:AW opensim currency support>
     ${CMAKE_BINARY_DIR}/newview #<FS:TS> Flickr upload
+    ${COLLADA_INCLUDE_DIRS}
     )
 
 set(viewer_SOURCE_FILES