diff options
| author | simon_linden <none@none> | 2013-09-19 15:30:34 -0700 |
|---|---|---|
| committer | simon_linden <none@none> | 2013-09-19 15:30:34 -0700 |
| commit | d3625d0b672d59b0164e1b4615edbb9550912ec6 (patch) | |
| tree | 292f86a4e1dc65d57faee094f5365bf72a240846 /indra/newview/llfilepicker.cpp | |
| parent | 8fa463113c19682a64988d2f8c527ef5e5dd156c (diff) | |
| parent | 95e34d86b9d86b3b3c7d3c39620e35b06f8fa9cf (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rwxr-xr-x | indra/newview/llfilepicker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 742a615902..3fec81b627 100755 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -873,6 +873,8 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename) success = false; } + send_agent_resume(); + // Account for the fact that the app has been stalled. LLFrameTimer::updateFrameTime(); return success; |