diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 06:46:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 06:46:00 -0400 |
| commit | 83cff21cfee5ca4fc13fc300e8dfb154ab6c3421 (patch) | |
| tree | 2843fd6ba9d02208b6bd1e240ae1cf9083b01732 /indra | |
| parent | 18e7881ee816f3f589ddb8b11d59582ad41c6014 (diff) | |
| parent | 8e42c0e0a7182f9f51769926b163709ced15d4b2 (diff) | |
merge openal linking fixes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/mac_updater/mac_updater.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
2 files changed, 3 insertions, 9 deletions
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)) 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: |