Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 34 insertions, 34 deletions

diff --git a/indra/newview/llviewerthrottle.h b/indra/newview/llviewerthrottle.h
index fe54b06662..5a690139e9 100644
--- a/indra/newview/llviewerthrottle.h
+++ b/indra/newview/llviewerthrottle.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerthrottle.h
  * @brief LLViewerThrottle class header file
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, 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$
  */
@@ -35,54 +35,54 @@
 
 class LLViewerThrottleGroup
 {
-	LLViewerThrottleGroup();
-	LLViewerThrottleGroup(const F32 settings[TC_EOF]);
+    LLViewerThrottleGroup();
+    LLViewerThrottleGroup(const F32 settings[TC_EOF]);
 
-	LLViewerThrottleGroup operator*(const F32 frac) const;
-	LLViewerThrottleGroup operator+(const LLViewerThrottleGroup &b) const;
-	LLViewerThrottleGroup operator-(const LLViewerThrottleGroup &b) const;
+    LLViewerThrottleGroup operator*(const F32 frac) const;
+    LLViewerThrottleGroup operator+(const LLViewerThrottleGroup &b) const;
+    LLViewerThrottleGroup operator-(const LLViewerThrottleGroup &b) const;
 
-	F32 getTotal()			{ return mThrottleTotal; }
-	void sendToSim() const;
+    F32 getTotal()          { return mThrottleTotal; }
+    void sendToSim() const;
 
-	void dump();
+    void dump();
 
-	friend class LLViewerThrottle;
+    friend class LLViewerThrottle;
 protected:
-	F32 mThrottles[TC_EOF];
-	F32 mThrottleTotal;
+    F32 mThrottles[TC_EOF];
+    F32 mThrottleTotal;
 };
 
 class LLViewerThrottle
 {
 public:
-	LLViewerThrottle();
+    LLViewerThrottle();
 
-	void setMaxBandwidth(F32 kbits_per_second, BOOL from_event = FALSE);
+    void setMaxBandwidth(F32 kbits_per_second, BOOL from_event = FALSE);
 
-	void load();
-	void save() const;
-	void sendToSim() const;
+    void load();
+    void save() const;
+    void sendToSim() const;
 
-	F32 getMaxBandwidth()const			{ return mMaxBandwidth; }
-	F32 getCurrentBandwidth() const		{ return mCurrentBandwidth; }
+    F32 getMaxBandwidth()const          { return mMaxBandwidth; }
+    F32 getCurrentBandwidth() const     { return mCurrentBandwidth; }
 
-	void updateDynamicThrottle();
-	void resetDynamicThrottle();
+    void updateDynamicThrottle();
+    void resetDynamicThrottle();
 
-	LLViewerThrottleGroup getThrottleGroup(const F32 bandwidth_kbps);
+    LLViewerThrottleGroup getThrottleGroup(const F32 bandwidth_kbps);
 
-	static const std::string sNames[TC_EOF];
+    static const std::string sNames[TC_EOF];
 protected:
-	F32 mMaxBandwidth;
-	F32 mCurrentBandwidth;
+    F32 mMaxBandwidth;
+    F32 mCurrentBandwidth;
+
+    LLViewerThrottleGroup mCurrent;
 
-	LLViewerThrottleGroup mCurrent;
+    std::vector<LLViewerThrottleGroup> mPresets;
 
-	std::vector<LLViewerThrottleGroup> mPresets;
-	
-	LLFrameTimer mUpdateTimer;
-	F32 mThrottleFrac;
+    LLFrameTimer mUpdateTimer;
+    F32 mThrottleFrac;
 };
 
 extern LLViewerThrottle gViewerThrottle;