livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up my sloppy commit and fixes to threaded file pickers

master
Cinders 2013-09-10 16:28:36 -06:00
parent 5d72fa20b7
commit 4f09d71bd8
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
indra/newview/llfilepicker.cpp
View File

@ -882,13 +882,17 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
mPickOptions |= F_FILE;
mPickOptions |= F_MULTIPLE;
// Modal, so pause agent
send_agent_pause();
// <FS:CR> Threaded Filepickers
if (blocking)
{
// Modal, so pause agent
send_agent_pause();
}
// </FS:CR>
success = doNavChooseDialog(filter);
send_agent_resume();
if (success)
{
if (!getFileCount())
@ -897,8 +901,15 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter, bool blocking)
mLocked = true;
}
// Account for the fact that the app has been stalled.
LLFrameTimer::updateFrameTime();
// <FS:CR> Threaded Filepickers
if (blocking)
{
send_agent_resume();
// Account for the fact that the app has been stalled.
LLFrameTimer::updateFrameTime();
}
// </FS:CR>
return success;
}
@ -922,8 +933,13 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
mPickOptions &= ~F_MULTIPLE;
// Modal, so pause agent
send_agent_pause();
// <FS:CR> Threaded filepickers
if (blocking)
{
// Modal, so pause agent
send_agent_pause();
}
// </FS:CR>
success = doNavSaveDialog(filter, filename);
@ -933,14 +949,15 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename,
success = false;
}
// <FS:CR>
// <FS:CR> Threaded filepickers
if (blocking)
{
send_agent_resume();
// </FS:CR>
// Account for the fact that the app has been stalled.
LLFrameTimer::updateFrameTime();
// Account for the fact that the app has been stalled.
LLFrameTimer::updateFrameTime();
}
// </FS:CR>
return success;
}
//END LL_DARWIN