Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/llavatarrenderinfoaccountant.h b/indra/newview/llavatarrenderinfoaccountant.h
index 6b5fa7bc35..774e1b6240 100644
--- a/indra/newview/llavatarrenderinfoaccountant.h
+++ b/indra/newview/llavatarrenderinfoaccountant.h
@@ -2,26 +2,26 @@
  * @file   llavatarrenderinfoaccountant.h
  * @author Dave Simmons
  * @date   2013-02-28
- * @brief  
- * 
+ * @brief
+ *
  * $LicenseInfo:firstyear=2013&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2013, 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$
  */
@@ -34,30 +34,30 @@
 
 class LLViewerRegion;
 
-// Class to gather avatar rendering information 
+// Class to gather avatar rendering information
 // that is sent to or fetched from regions.
 class LLAvatarRenderInfoAccountant : public LLSingleton<LLAvatarRenderInfoAccountant>
 {
-	LLSINGLETON(LLAvatarRenderInfoAccountant);
-	~LLAvatarRenderInfoAccountant();
+    LLSINGLETON(LLAvatarRenderInfoAccountant);
+    ~LLAvatarRenderInfoAccountant();
 
   private:
-	LOG_CLASS(LLAvatarRenderInfoAccountant);
+    LOG_CLASS(LLAvatarRenderInfoAccountant);
 
   public:
-	void sendRenderInfoToRegion(LLViewerRegion * regionp);
-	void getRenderInfoFromRegion(LLViewerRegion * regionp);
+    void sendRenderInfoToRegion(LLViewerRegion * regionp);
+    void getRenderInfoFromRegion(LLViewerRegion * regionp);
 
-	void idle(); // called once per frame 
+    void idle(); // called once per frame
 
-	void resetRenderInfoScanTimer();
-	
-	static void scanNewRegion(const LLUUID& region_id);
+    void resetRenderInfoScanTimer();
+
+    static void scanNewRegion(const LLUUID& region_id);
 
   private:
-	// frequency of region scans,
-	// further limited by per region Request and Report timers
-	LLFrameTimer mRenderInfoScanTimer; 
+    // frequency of region scans,
+    // further limited by per region Request and Report timers
+    LLFrameTimer mRenderInfoScanTimer;
 
     static void avatarRenderInfoGetCoro(std::string url, U64 regionHandle);
     static void avatarRenderInfoReportCoro(std::string url, U64 regionHandle);