diff options
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 1 | ||||
| -rw-r--r-- | indra/mac_updater/mac_updater.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
4 files changed, 9 insertions, 16 deletions
diff --git a/autobuild.xml b/autobuild.xml index 65d9764cc6..4951be63bc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1062,9 +1062,9 @@ <key>archive</key> <map> <key>hash</key> - <string>0326cb770c7ff995cf822fb330ae9d0c</string> + <string>76c1015eafcba5ca9932c3009533b51c</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-darwin-20110308.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/225273/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110329.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1074,9 +1074,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ed7d6cb66e6fcd6dbac41aabe6a0d0c8</string> + <string>c05a33ee8b6f253b5a744596dfc3707d</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/224858/arch/Linux/installer/llqtwebkit-4.7.1-linux-20110323.tar.bz2</string> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20101013.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1086,9 +1086,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7865b9c3a5d9f9424af56d5d05b82de9</string> + <string>1b1b8e104e39c542d69eb37b5ee81818</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110210.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/225249/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110329.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 6e8f6cec7f..b599982afb 100644 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -67,7 +67,6 @@ elseif (LINUX) QtNetwork QtGui QtCore - jscore jpeg fontconfig X11 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: |