diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
| commit | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch) | |
| tree | 9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/mac_updater/mac_updater.cpp | |
| parent | 2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff) | |
| parent | f12d79907c7f002666291ab23dbb01ba715fa2c1 (diff) | |
merge out end-of-develop.py tag from viewer-development
Diffstat (limited to 'indra/mac_updater/mac_updater.cpp')
| -rw-r--r-- | indra/mac_updater/mac_updater.cpp | 10 |
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)) |