summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJennifer Leech <jenn@lindenlab.com>2008-06-27 17:28:15 +0000
committerJennifer Leech <jenn@lindenlab.com>2008-06-27 17:28:15 +0000
commit41877d457ab9542dca22b99f3eddb1bfcfe7c1d6 (patch)
tree2ba5762d45470024e7f19bde9f9e03c6579540f6 /indra
parentd32c8825b63ca8dc9f1571aefea01cc89eba36e6 (diff)
vivox is cleared for open source distribution
removing conditional install reviewed by cg
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/ViewerMiscLibs.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 1665dd50f1..7329972596 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -4,8 +4,6 @@ include(Prebuilt)
if (NOT STANDALONE)
use_prebuilt_binary(libstdc++)
use_prebuilt_binary(libuuid)
- if(INSTALL_PROPRIETARY)
- use_prebuilt_binary(vivox)
- endif(INSTALL_PROPRIETARY)
+ use_prebuilt_binary(vivox)
endif(NOT STANDALONE)