diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:44:45 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:44:45 +0200 |
commit | 4dd3d230ec7a43845f1a72dfcc7152ab04550d8e (patch) | |
tree | 2f6f9feefa9bdd7dd6ee4595bf65ad1af038047e /indra/llmessage/llproxy.cpp | |
parent | b1ceef6ea4abffdfb36844c3b8e469283edce229 (diff) | |
parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
-rw-r--r-- | indra/llmessage/llproxy.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index dea03aab85..950599217f 100644 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -403,8 +403,11 @@ LLSocks5AuthType LLProxy::getSelectedAuthMethod() const //static void LLProxy::cleanupClass() { - getInstance()->stopSOCKSProxy(); - deleteSingleton(); + if (instanceExists()) + { + getInstance()->stopSOCKSProxy(); + deleteSingleton(); + } } /** |