Merge branch 'project/lua_editor' into marchcat/slua-linux

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;
         }
     }