diff options
| author | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
| commit | 15e6939342956f830996299352bcf7fffa7c3b85 (patch) | |
| tree | dcd6443f049d35b3f3401d768b1eab735eda363b /indra/llmessage/llproxy.cpp | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
| parent | 1d0d485b69bbbfd63d2d56a795d818131db2667c (diff) | |
merge with release
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
| -rwxr-xr-x | indra/llmessage/llproxy.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index 9988fcd9c0..9b8d19cc3e 100755 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -57,13 +57,15 @@ LLProxy::LLProxy(): mAuthMethodSelected(METHOD_NOAUTH), mSocksUsername(), mSocksPassword() -{ -} +{} LLProxy::~LLProxy() { - stopSOCKSProxy(); - disableHTTPProxy(); + if (ll_apr_is_initialized()) + { + stopSOCKSProxy(); + disableHTTPProxy(); + } } /** |