diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-05-02 09:39:03 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-05-02 09:39:03 -0700 |
| commit | bb96ac2621dd09dbc318d04f7e04ffbc50ec3174 (patch) | |
| tree | 9e692dbb89e46faaea656af979b6855502481772 /indra/newview/llfloater360capture.cpp | |
| parent | fbf5b199f3bd9775bc992609baf6c093177a70d8 (diff) | |
| parent | 7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff) | |
MErge with main after Viewer release
Diffstat (limited to 'indra/newview/llfloater360capture.cpp')
| -rw-r--r-- | indra/newview/llfloater360capture.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp index 542a1ea39b..23f86e2361 100644 --- a/indra/newview/llfloater360capture.cpp +++ b/indra/newview/llfloater360capture.cpp @@ -319,13 +319,7 @@ const std::string LLFloater360Capture::getHTMLBaseFolder() // triggered when the 'capture' button in the UI is pressed void LLFloater360Capture::onCapture360ImagesBtn() { - // launch the main capture code in a coroutine so we can - // yield/suspend at some points to give the main UI - // thread a look-in occasionally. - LLCoros::instance().launch("capture360cap", [this]() - { - capture360Images(); - }); + capture360Images(); } // Gets the full path name for a given JavaScript file in the HTML folder. We @@ -686,9 +680,6 @@ void LLFloater360Capture::capture360Images() mCaptureBtn->setEnabled(true); mSaveLocalBtn->setEnabled(true); - // allow the UI to update by suspending and waiting for the - // main render loop to update the UI - suspendForAFrame(); } // once the request is made to navigate to the web page containing the code |