From 7564583238c8fabe042dedf7d7491fa0a81db8f3 Mon Sep 17 00:00:00 2001 From: "alain@945battery-guestA-183.lindenlab.com" Date: Mon, 28 Mar 2011 13:34:06 -0700 Subject: fix openal linking of viewer. --- indra/newview/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2574454d96..e93ef8c498 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1688,6 +1688,12 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${GOOGLE_PERFTOOLS_LIBRARIES} ) +if (OPENAL) + target_link_libraries(${VIEWER_BINARY_NAME} + ${OPENAL_LIBRARIES} + ) +endif() + if (USE_KDU) target_link_libraries(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARIES} -- cgit v1.2.3 From d20f8a07cce466dcdddd9c113c32f53faa4ab0fd Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 28 Mar 2011 14:00:35 -0700 Subject: fix CHOP-402: use newer api call for move to trash that will rename if needed. --- indra/mac_updater/mac_updater.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp index 5d19e8a889..809f66cb1d 100644 --- a/indra/mac_updater/mac_updater.cpp +++ b/indra/mac_updater/mac_updater.cpp @@ -1230,20 +1230,14 @@ void *updatethreadproc(void*) // Move work directory to the trash if(tempDir[0] != 0) { -// chdir("/"); -// FSDeleteObjects(tempDirRef); - llinfos << "Moving work directory to the trash." << llendl; - err = FSMoveObject(&tempDirRef, &trashFolderRef, NULL); + FSRef trashRef; + OSStatus err = FSMoveObjectToTrashSync(&tempDirRef, &trashRef, 0); if(err != noErr) { llwarns << "failed to move files to trash, (error code " << err << ")" << llendl; } - -// snprintf(temp, sizeof(temp), "rm -rf '%s'", tempDir); -// printf("%s\n", temp); -// system(temp); } if(!gCancelled && !gFailure && (target[0] != 0)) -- cgit v1.2.3 From 1a49226a894900332fb90bef6507986df2d5515b Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 28 Mar 2011 22:49:53 +0000 Subject: well, that didn't work. Rollback.. --- indra/newview/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e93ef8c498..2574454d96 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1688,12 +1688,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${GOOGLE_PERFTOOLS_LIBRARIES} ) -if (OPENAL) - target_link_libraries(${VIEWER_BINARY_NAME} - ${OPENAL_LIBRARIES} - ) -endif() - if (USE_KDU) target_link_libraries(${VIEWER_BINARY_NAME} ${LLKDU_LIBRARIES} -- cgit v1.2.3 From 8e42c0e0a7182f9f51769926b163709ced15d4b2 Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Mon, 28 Mar 2011 22:51:45 +0000 Subject: get naming of openallib right when packaging. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 39ac03cd20..f0b1973fdf 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -953,7 +953,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libopenjpeg.so.1") self.path("libopenjpeg.so") self.path("libalut.so") - self.path("libopenal.so") + self.path("libopenal.so", "libopenal.so.1") self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname self.path("libfontconfig.so.1.4.4") try: -- cgit v1.2.3