Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llaudiosourcevo.h b/indra/newview/llaudiosourcevo.h
index 672a07f7d3..3a21ec6d6b 100644
--- a/indra/newview/llaudiosourcevo.h
+++ b/indra/newview/llaudiosourcevo.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llaudiosourcevo.h
  * @author Douglas Soo, James Cook
  * @brief Audio sources attached to viewer objects
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -36,20 +36,20 @@ class LLViewerObject;
 class LLAudioSourceVO : public LLAudioSource
 {
 public:
-	LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp);
-	virtual ~LLAudioSourceVO();
-	/*virtual*/	void update();
-	/*virtual*/ void setGain(const F32 gain);
+    LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp);
+    virtual ~LLAudioSourceVO();
+    /*virtual*/ void update();
+    /*virtual*/ void setGain(const F32 gain);
 
-	void checkCutOffRadius();
+    void checkCutOffRadius();
 
 private:
-	LLVector3d getPosGlobal() const;
-	bool isInCutOffRadius(LLVector3d pos_global, const F32 cutoff) const;
-	void updateMute();
+    LLVector3d getPosGlobal() const;
+    bool isInCutOffRadius(LLVector3d pos_global, const F32 cutoff) const;
+    void updateMute();
 
 private:
-	LLPointer<LLViewerObject>	mObjectp;
+    LLPointer<LLViewerObject>   mObjectp;
 };
 
 #endif // LL_LLAUDIOSOURCEVO_H