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

Maint X -> Materials Featurette merge

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/newview/llfloatermyscripts.h b/indra/newview/llfloatermyscripts.h
index 3c053a0223..857a2d72f2 100644
--- a/indra/newview/llfloatermyscripts.h
+++ b/indra/newview/llfloatermyscripts.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloatermyscripts.h
  * @brief LLFloaterMyScripts class definition.
  *
  * $LicenseInfo:firstyear=2004&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2019, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -33,30 +33,30 @@
 class LLFloaterMyScripts : public LLFloater
 {
 public:
-	LLFloaterMyScripts(const LLSD& seed);
+    LLFloaterMyScripts(const LLSD& seed);
 
-	BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-	void setAttachmentDetails(LLSD content);
-	void setAttachmentSummary(LLSD content);
-	bool requestAttachmentDetails();
-	void clearList();
+    BOOL postBuild();
+    /*virtual*/ void onOpen(const LLSD& key);
+    void setAttachmentDetails(LLSD content);
+    void setAttachmentSummary(LLSD content);
+    bool requestAttachmentDetails();
+    void clearList();
 
 private:
-	void getAttachmentLimitsCoro(std::string url);
+    void getAttachmentLimitsCoro(std::string url);
 
-	bool mGotAttachmentMemoryUsed;
-	bool mAttachmentDetailsRequested;
-	S32 mAttachmentMemoryMax;
-	S32 mAttachmentMemoryUsed;
+    bool mGotAttachmentMemoryUsed;
+    bool mAttachmentDetailsRequested;
+    S32 mAttachmentMemoryMax;
+    S32 mAttachmentMemoryUsed;
 
-	bool mGotAttachmentURLsUsed;
-	S32 mAttachmentURLsMax;
-	S32 mAttachmentURLsUsed;
+    bool mGotAttachmentURLsUsed;
+    S32 mAttachmentURLsMax;
+    S32 mAttachmentURLsUsed;
 
 protected:
-	
-	static void onClickRefresh(void* userdata);
+
+    static void onClickRefresh(void* userdata);
 };
 
 #endif