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, 36 insertions, 36 deletions

diff --git a/indra/newview/llhudeffectpointat.h b/indra/newview/llhudeffectpointat.h
index 6200b68cbc..501e2992e2 100644
--- a/indra/newview/llhudeffectpointat.h
+++ b/indra/newview/llhudeffectpointat.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llhudeffectpointat.h
  * @brief LLHUDEffectPointAt class definition
  *
  * $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,50 +35,50 @@ class LLVOAvatar;
 
 typedef enum e_pointat_type
 {
-	POINTAT_TARGET_NONE,
-	POINTAT_TARGET_SELECT,
-	POINTAT_TARGET_GRAB,
-	POINTAT_TARGET_CLEAR,
-	POINTAT_NUM_TARGETS
+    POINTAT_TARGET_NONE,
+    POINTAT_TARGET_SELECT,
+    POINTAT_TARGET_GRAB,
+    POINTAT_TARGET_CLEAR,
+    POINTAT_NUM_TARGETS
 } EPointAtType;
 
 class LLHUDEffectPointAt : public LLHUDEffect
 {
 public:
-	friend class LLHUDObject;
+    friend class LLHUDObject;
 
-	/*virtual*/ void markDead();
-	/*virtual*/ void setSourceObject(LLViewerObject* objectp);
+    /*virtual*/ void markDead();
+    /*virtual*/ void setSourceObject(LLViewerObject* objectp);
 
-	BOOL setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position);
-	void clearPointAtTarget();
+    BOOL setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position);
+    void clearPointAtTarget();
 
-	EPointAtType getPointAtType() { return mTargetType; }
-	const LLVector3& getPointAtPosAgent() { return mTargetPos; }
-	const LLVector3d getPointAtPosGlobal();
+    EPointAtType getPointAtType() { return mTargetType; }
+    const LLVector3& getPointAtPosAgent() { return mTargetPos; }
+    const LLVector3d getPointAtPosGlobal();
 protected:
-	LLHUDEffectPointAt(const U8 type);
-	~LLHUDEffectPointAt();
+    LLHUDEffectPointAt(const U8 type);
+    ~LLHUDEffectPointAt();
 
-	/*virtual*/ void render();
-	/*virtual*/ void packData(LLMessageSystem *mesgsys);
-	/*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
+    /*virtual*/ void render();
+    /*virtual*/ void packData(LLMessageSystem *mesgsys);
+    /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 
-	// lookat behavior has either target position or target object with offset
-	void setTargetObjectAndOffset(LLViewerObject *objp, LLVector3d offset);
-	void setTargetPosGlobal(const LLVector3d &target_pos_global);
-	bool calcTargetPosition();
-	void update();
+    // lookat behavior has either target position or target object with offset
+    void setTargetObjectAndOffset(LLViewerObject *objp, LLVector3d offset);
+    void setTargetPosGlobal(const LLVector3d &target_pos_global);
+    bool calcTargetPosition();
+    void update();
 public:
-	static BOOL sDebugPointAt;
+    static BOOL sDebugPointAt;
 private:
-	EPointAtType				mTargetType;
-	LLVector3d					mTargetOffsetGlobal;
-	LLVector3					mLastSentOffsetGlobal;
-	F32							mKillTime;
-	LLFrameTimer				mTimer;
-	LLVector3					mTargetPos;
-	F32							mLastSendTime;
+    EPointAtType                mTargetType;
+    LLVector3d                  mTargetOffsetGlobal;
+    LLVector3                   mLastSentOffsetGlobal;
+    F32                         mKillTime;
+    LLFrameTimer                mTimer;
+    LLVector3                   mTargetPos;
+    F32                         mLastSendTime;
 };
 
 #endif // LL_LLHUDEFFECTPOINTAT_H