diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-04-13 21:03:44 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-04-13 21:03:44 +0000 |
| commit | 664f27380c285763a91e7deeaf012e576c9ab668 (patch) | |
| tree | f43ca6851007c1ce70fdf85d3700ce104219c313 /indra | |
| parent | 72c5076d6efbddbaf4667beb8c1a5a727a8c8ff9 (diff) | |
merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 5868e4d07e..2fbd5a3fb8 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -79,7 +79,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(GRID agni CACHE STRING "Target Grid") set(VIEWER ON CACHE BOOL "Build Second Life viewer.") -set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name") +set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c79c2aedf1..bf2067968b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -447,8 +447,15 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") - # llkdu dynamic library - self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib") + # need to get the kdu dll from any of the build directories as well + try: + self.path(self.find_existing_file('../llkdu/%s/libllkdu.dylib' % self.args['configuration'], + "../../libraries/universal-darwin/lib_release/libllkdu.dylib"), + dst='libllkdu.dylib') + pass + except: + print "Skipping libllkdu.dylib" + pass #libfmodwrapper.dylib self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") |