summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2011-03-28 14:00:48 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2011-03-28 14:00:48 -0700
commit77e42886966d82ff11782666b66f1743f3004288 (patch)
tree9ff5c661902fea0bade943d45f17c94365ce6b69 /indra
parentd97d1326c24f7f163fbeabb3ad41f72c9ded950d (diff)
parentd20f8a07cce466dcdddd9c113c32f53faa4ab0fd (diff)
Automated merge with https://bitbucket.org/merov_linden/viewer-autobuild2010
Diffstat (limited to 'indra')
-rw-r--r--indra/mac_updater/mac_updater.cpp10
1 files changed, 2 insertions, 8 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))