diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-11-21 14:15:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-21 14:15:53 -0800 |
| commit | 486753d141de0f69c95da82a336da2fcc0117639 (patch) | |
| tree | df50253db5a231eebea6cbf4389368d8535c02f0 | |
| parent | e153d784607b2944ff5a444e8674fe5953597a15 (diff) | |
| parent | 939118207ede734fec67dc864aad766b63679552 (diff) | |
Merge pull request #5033 from WolfGangS/wolfgang/project/lua_editor_websocket_crash
Minimal fix for ctd in lua_editor viewer #5031
| -rw-r--r-- | indra/llcorehttp/llwebsocketmgr.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/indra/llcorehttp/llwebsocketmgr.cpp b/indra/llcorehttp/llwebsocketmgr.cpp index addd108b71..ea87d1e07e 100644 --- a/indra/llcorehttp/llwebsocketmgr.cpp +++ b/indra/llcorehttp/llwebsocketmgr.cpp @@ -208,15 +208,29 @@ struct Server_impl void init() { mServer.init_asio(); - if (mLocalOnly) + try { + if (mLocalOnly) + { + std::stringstream port_str; + port_str << mPort; + mServer.listen("127.0.0.1", port_str.str()); + } + else + { + mServer.listen(mPort); + } + } + catch (const websocketpp::exception& e) { - std::stringstream port_str; - port_str << mPort; - mServer.listen("127.0.0.1", port_str.str()); + LL_WARNS("WebSocket") << "WebSocket server listen exception: " << e.what() << LL_ENDL; } - else + catch (const std::exception& e) + { + LL_WARNS("WebSocket") << "WebSocket server listen std::exception: " << e.what() << LL_ENDL; + } + catch (...) { - mServer.listen(mPort); + LL_WARNS("WebSocket") << "WebSocket server listen unknown exception" << LL_ENDL; } } |