summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-08 00:25:07 -0800
committerRichard Linden <none@none>2013-01-08 00:25:07 -0800
commit3c341a11ab7b8f3fd18afcf3f50af6dfafa632c2 (patch)
treec937cdcd5368a2b4665d06a1af047eebddd31737 /indra/llmessage
parent68413515029f50713c70e4adec3ce6fd1022d59f (diff)
SH-3468 WIP add memory tracking base class
more fixes for unit test crashes added llcommon initialization/teardown for unit tests that indirectly trigger lltrace changed access of atomic refcount to use preincrement/decrement operators to reflect desired semantics always call apr_initialize in LLCommon::initClass, even if already initialized...apr does internal reference counting to keep things straight
Diffstat (limited to 'indra/llmessage')
-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 aa474fabd2..9b8d19cc3e 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -61,8 +61,11 @@ LLProxy::LLProxy():
LLProxy::~LLProxy()
{
- stopSOCKSProxy();
- disableHTTPProxy();
+ if (ll_apr_is_initialized())
+ {
+ stopSOCKSProxy();
+ disableHTTPProxy();
+ }
}
/**