summaryrefslogtreecommitdiff
path: root/indra/llmessage/llproxy.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-14 23:46:15 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-14 23:46:15 +0200
commit4b261a90ae3dead0a1fa843268bae0fda710648b (patch)
tree152732b57c90bc23e4893092212a04feff281de5 /indra/llmessage/llproxy.cpp
parent26732bc576f86fde532e1f9448bd127515f70612 (diff)
parent78bdf57ad6610b34389226bf941ba736ca0c2225 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
-rw-r--r--indra/llmessage/llproxy.cpp7
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();
+ }
}
/**