Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp

1 files changed, 4 insertions, 5 deletions

diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 3836a9b5fb..1107973569 100755
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -144,14 +144,9 @@ private:
 };
 
 /**
- * intrusive pointer support
- * this allows you to use boost::intrusive_ptr with any LLRefCount-derived type
- */
-/**
  * intrusive pointer support for LLThreadSafeRefCount
  * this allows you to use boost::intrusive_ptr with any LLThreadSafeRefCount-derived type
  */
-
 inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p) 
 {
 	p->ref();
@@ -162,6 +157,10 @@ inline void intrusive_ptr_release(LLThreadSafeRefCount* p)
 	p->unref(); 
 }
 
+/**
+ * intrusive pointer support
+ * this allows you to use boost::intrusive_ptr with any LLRefCount-derived type
+ */
 inline void intrusive_ptr_add_ref(LLRefCount* p) 
 {
 	p->ref();