Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/llcorehttp/_httpopcancel.h b/indra/llcorehttp/_httpopcancel.h
index 86944eb159..ac71a55f4e 100644
--- a/indra/llcorehttp/_httpopcancel.h
+++ b/indra/llcorehttp/_httpopcancel.h
@@ -24,11 +24,11 @@
  * $/LicenseInfo$
  */
 
-#ifndef	_LLCORE_HTTP_OPCANCEL_H_
-#define	_LLCORE_HTTP_OPCANCEL_H_
+#ifndef _LLCORE_HTTP_OPCANCEL_H_
+#define _LLCORE_HTTP_OPCANCEL_H_
 
 
-#include "linden_common.h"		// Modifies curl/curl.h interfaces
+#include "linden_common.h"      // Modifies curl/curl.h interfaces
 
 #include "httpcommon.h"
 
@@ -52,22 +52,22 @@ namespace LLCore
 class HttpOpCancel : public HttpOperation
 {
 public:
-	/// @param	handle	Handle of previously-issued request to
-	///					be canceled.
-	HttpOpCancel(HttpHandle handle);
+    /// @param  handle  Handle of previously-issued request to
+    ///                 be canceled.
+    HttpOpCancel(HttpHandle handle);
+
+    virtual ~HttpOpCancel();                            // Use release()
 
-	virtual ~HttpOpCancel();							// Use release()
-	
 public:
-	virtual void stageFromRequest(HttpService *);
-			
+    virtual void stageFromRequest(HttpService *);
+
 public:
-	// Request data
-	HttpHandle			mHandle;
+    // Request data
+    HttpHandle          mHandle;
 };  // end class HttpOpCancel
 
 
 }   // end namespace LLCore
 
-#endif	// _LLCORE_HTTP_OPCANCEL_H_
+#endif  // _LLCORE_HTTP_OPCANCEL_H_